From 28419ce75a80cd7355c62de23e3b79a77a8e6c3c Mon Sep 17 00:00:00 2001
From: Daniel Pinheiro <3842788+dscpinheiro@users.noreply.github.com>
Date: Tue, 12 Aug 2025 15:15:32 -0400
Subject: [PATCH] Revert "Generate 7 more S3 operations (#3949)"

This reverts commit 377386da22a93131ed847b58bf7d13039fc9b8f0.
---
 .../79b46eff-9dd1-4281-88f0-22c700a96506.json |   19 -
 .../Customizations.cs                         |  100 +-
 .../Generators/Marshallers/BaseMarshaller.cs  |   92 +-
 .../Generators/Marshallers/BaseMarshaller.tt  |   17 +
 .../Marshallers/BaseResponseUnmarshaller.cs   |  799 +++++--------
 .../Marshallers/BaseResponseUnmarshaller.tt   |   57 +-
 .../Marshallers/RestXmlRequestMarshaller.cs   | 1010 +++++++----------
 .../Marshallers/RestXmlRequestMarshaller.tt   |   34 +-
 .../RestXmlResponseUnmarshaller.cs            |   37 +-
 .../RestXmlResponseUnmarshaller.tt            |    8 +-
 .../RestXmlStructureUnmarshaller.cs           |   10 +-
 .../RestXmlStructureUnmarshaller.tt           |    2 -
 .../ServiceClientGeneratorLib/ServiceModel.cs |   24 +-
 .../ServiceModels/s3/s3.customizations.json   |  193 +---
 .../Model/GetObjectACLRequest.cs}             |   22 +-
 .../Model/GetObjectACLResponse.cs}            |   14 +-
 .../Custom/Model/GetObjectMetadataRequest.cs  |  598 ++++++++++
 .../Custom/Model/GetObjectMetadataResponse.cs |  601 +++++++++-
 .../GetObjectACLRequestMarshaller.cs}         |   26 +-
 .../GetObjectACLResponseUnmarshaller.cs}      |   54 +-
 .../GetObjectMetadataRequestMarshaller.cs     |   99 +-
 .../GetObjectMetadataResponseUnmarshaller.cs  |  129 ++-
 .../ListObjectsV2RequestMarshaller.cs         |   93 ++
 .../ListObjectsV2ResponseUnmarshaller.cs      |  163 ++-
 .../ListVersionsRequestMarshaller.cs          |   91 ++
 .../ListVersionsResponseUnmarshaller.cs       |  170 ++-
 .../PutBucketACLRequestMarshaller.cs}         |  125 +-
 .../PutBucketACLResponseUnmarshaller.cs}      |   34 +-
 .../PutCORSConfigurationRequestMarshaller.cs  |  191 ++++
 ...utCORSConfigurationResponseUnmarshaller.cs |   62 +
 .../PutObjectACLRequestMarshaller.cs}         |  120 +-
 .../PutObjectACLResponseUnmarshaller.cs}      |   42 +-
 .../RestoreStatusUnmarshaller.cs              |   58 +-
 .../Model/ListObjectsV2Request.cs             |  233 ++--
 .../Model/ListObjectsV2Response.cs            |  237 ++--
 .../Model/ListVersionsRequest.cs              |  204 ++--
 .../S3/Custom/Model/ListVersionsResponse.cs   |  251 ++++
 .../Model/PutBucketACLRequest.cs}             |   57 +-
 .../Model/PutBucketACLResponse.cs}            |    5 +-
 .../Model/PutCORSConfigurationRequest.cs      |  129 +--
 .../Model/PutCORSConfigurationResponse.cs     |   15 +-
 .../Model/PutObjectACLRequest.cs}             |   59 +-
 .../Model/PutObjectACLResponse.cs}            |    7 +-
 .../Model/RestoreStatus.cs                    |   49 +-
 .../S3/Custom/Model/S3AccessControlList.cs    |   55 +-
 sdk/src/Services/S3/Custom/Model/S3Object.cs  |  196 +++-
 .../S3/Custom/Model/S3ObjectVersion.cs        |   24 +-
 .../S3/Generated/Model/CommonPrefix.cs        |   61 -
 .../S3/Generated/Model/DeleteMarkerEntry.cs   |  136 ---
 .../Model/GetObjectMetadataRequest.cs         |  688 -----------
 .../Model/GetObjectMetadataResponse.cs        |  796 -------------
 ...bortMultipartUploadResponseUnmarshaller.cs |    5 +-
 .../CommonPrefixUnmarshaller.cs               |   91 --
 ...dataTableConfigurationRequestMarshaller.cs |    2 +
 ...aTableConfigurationResponseUnmarshaller.cs |    5 +-
 ...eteBucketEncryptionResponseUnmarshaller.cs |    5 +-
 ...aTableConfigurationResponseUnmarshaller.cs |    5 +-
 ...etOwnershipControlsResponseUnmarshaller.cs |    5 +-
 .../DeleteBucketPolicyResponseUnmarshaller.cs |    5 +-
 ...teBucketReplicationResponseUnmarshaller.cs |    5 +-
 .../DeleteBucketResponseUnmarshaller.cs       |    5 +-
 ...DeleteBucketTaggingResponseUnmarshaller.cs |    5 +-
 ...teCORSConfigurationResponseUnmarshaller.cs |    5 +-
 ...ecycleConfigurationResponseUnmarshaller.cs |    5 +-
 .../DeleteMarkerEntryUnmarshaller.cs          |  115 --
 ...tePublicAccessBlockResponseUnmarshaller.cs |    5 +-
 ...lerateConfigurationResponseUnmarshaller.cs |    6 +-
 .../GetBucketAclResponseUnmarshaller.cs       |    6 +-
 ...GetBucketEncryptionResponseUnmarshaller.cs |    6 +-
 .../GetBucketLocationResponseUnmarshaller.cs  |    6 +-
 ...aTableConfigurationResponseUnmarshaller.cs |    6 +-
 ...tBucketNotificationResponseUnmarshaller.cs |    6 +-
 ...etOwnershipControlsResponseUnmarshaller.cs |    6 +-
 .../GetBucketPolicyResponseUnmarshaller.cs    |    5 +-
 ...tBucketPolicyStatusResponseUnmarshaller.cs |    6 +-
 ...etBucketReplicationResponseUnmarshaller.cs |    6 +-
 ...ucketRequestPaymentResponseUnmarshaller.cs |    6 +-
 .../GetBucketTaggingResponseUnmarshaller.cs   |    6 +-
 ...etCORSConfigurationResponseUnmarshaller.cs |    6 +-
 ...ecycleConfigurationResponseUnmarshaller.cs |    6 +-
 ...GetObjectAttributesResponseUnmarshaller.cs |    6 +-
 .../GetObjectLegalHoldResponseUnmarshaller.cs |    6 +-
 ...ctLockConfigurationResponseUnmarshaller.cs |    6 +-
 .../GetObjectMetadataRequestMarshaller.cs     |  160 ---
 .../GetObjectMetadataResponseUnmarshaller.cs  |  164 ---
 .../GetObjectRetentionResponseUnmarshaller.cs |    6 +-
 .../GetObjectTaggingResponseUnmarshaller.cs   |    6 +-
 ...etPublicAccessBlockResponseUnmarshaller.cs |    6 +-
 .../HeadBucketResponseUnmarshaller.cs         |    5 +-
 ...iateMultipartUploadResponseUnmarshaller.cs |    6 +-
 .../ListBucketsResponseUnmarshaller.cs        |    6 +-
 ...istDirectoryBucketsResponseUnmarshaller.cs |    6 +-
 .../ListObjectsV2RequestMarshaller.cs         |  125 --
 .../ListObjectsV2ResponseUnmarshaller.cs      |  203 ----
 .../ListPartsResponseUnmarshaller.cs          |    6 +-
 .../ListVersionsRequestMarshaller.cs          |  122 --
 .../ListVersionsResponseUnmarshaller.cs       |  204 ----
 .../PutBucketEncryptionRequestMarshaller.cs   |    2 +
 ...PutBucketEncryptionResponseUnmarshaller.cs |    5 +-
 ...tBucketNotificationResponseUnmarshaller.cs |    5 +-
 .../PutBucketPolicyRequestMarshaller.cs       |    2 +
 .../PutBucketPolicyResponseUnmarshaller.cs    |    5 +-
 .../PutBucketReplicationRequestMarshaller.cs  |    2 +
 ...utBucketReplicationResponseUnmarshaller.cs |    5 +-
 .../PutBucketResponseUnmarshaller.cs          |    5 +-
 .../PutCORSConfigurationRequestMarshaller.cs  |  186 ---
 ...utCORSConfigurationResponseUnmarshaller.cs |   98 --
 ...ecycleConfigurationResponseUnmarshaller.cs |    5 +-
 .../PutObjectLegalHoldRequestMarshaller.cs    |    2 +
 .../PutObjectLegalHoldResponseUnmarshaller.cs |    5 +-
 ...bjectLockConfigurationRequestMarshaller.cs |    2 +
 ...ctLockConfigurationResponseUnmarshaller.cs |    5 +-
 .../PutObjectRetentionRequestMarshaller.cs    |    2 +
 .../PutObjectRetentionResponseUnmarshaller.cs |    5 +-
 .../PutObjectTaggingRequestMarshaller.cs      |    2 +
 .../PutObjectTaggingResponseUnmarshaller.cs   |    5 +-
 .../PutPublicAccessBlockRequestMarshaller.cs  |    2 +
 ...utPublicAccessBlockResponseUnmarshaller.cs |    5 +-
 .../S3ObjectUnmarshaller.cs                   |  143 ---
 .../S3ObjectVersionUnmarshaller.cs            |  155 ---
 .../Generated/Model/ListVersionsResponse.cs   |  316 ------
 .../S3/Generated/Model/S3AccessControlList.cs |   82 --
 .../Services/S3/Generated/Model/S3Object.cs   |  268 -----
 .../S3/Generated/Model/S3ObjectVersion.cs     |   78 --
 .../UnitTests/Custom/ConstantClassTestBase.cs |    2 +-
 125 files changed, 4241 insertions(+), 6848 deletions(-)
 delete mode 100644 generator/.DevConfigs/79b46eff-9dd1-4281-88f0-22c700a96506.json
 rename sdk/src/Services/S3/{Generated/Model/GetObjectAclRequest.cs => Custom/Model/GetObjectACLRequest.cs} (90%)
 rename sdk/src/Services/S3/{Generated/Model/GetObjectAclResponse.cs => Custom/Model/GetObjectACLResponse.cs} (78%)
 rename sdk/src/Services/S3/{Generated/Model/Internal/MarshallTransformations/GetObjectAclRequestMarshaller.cs => Custom/Model/Internal/MarshallTransformations/GetObjectACLRequestMarshaller.cs} (82%)
 rename sdk/src/Services/S3/{Generated/Model/Internal/MarshallTransformations/GetObjectAclResponseUnmarshaller.cs => Custom/Model/Internal/MarshallTransformations/GetObjectACLResponseUnmarshaller.cs} (69%)
 create mode 100644 sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListObjectsV2RequestMarshaller.cs
 create mode 100644 sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListVersionsRequestMarshaller.cs
 rename sdk/src/Services/S3/{Generated/Model/Internal/MarshallTransformations/PutBucketAclRequestMarshaller.cs => Custom/Model/Internal/MarshallTransformations/PutBucketACLRequestMarshaller.cs} (60%)
 rename sdk/src/Services/S3/{Generated/Model/Internal/MarshallTransformations/PutBucketAclResponseUnmarshaller.cs => Custom/Model/Internal/MarshallTransformations/PutBucketACLResponseUnmarshaller.cs} (60%)
 create mode 100644 sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutCORSConfigurationRequestMarshaller.cs
 create mode 100644 sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutCORSConfigurationResponseUnmarshaller.cs
 rename sdk/src/Services/S3/{Generated/Model/Internal/MarshallTransformations/PutObjectAclRequestMarshaller.cs => Custom/Model/Internal/MarshallTransformations/PutObjectACLRequestMarshaller.cs} (64%)
 rename sdk/src/Services/S3/{Generated/Model/Internal/MarshallTransformations/PutObjectAclResponseUnmarshaller.cs => Custom/Model/Internal/MarshallTransformations/PutObjectACLResponseUnmarshaller.cs} (55%)
 rename sdk/src/Services/S3/{Generated => Custom}/Model/Internal/MarshallTransformations/RestoreStatusUnmarshaller.cs (51%)
 rename sdk/src/Services/S3/{Generated => Custom}/Model/ListObjectsV2Request.cs (59%)
 rename sdk/src/Services/S3/{Generated => Custom}/Model/ListObjectsV2Response.cs (51%)
 rename sdk/src/Services/S3/{Generated => Custom}/Model/ListVersionsRequest.cs (59%)
 create mode 100644 sdk/src/Services/S3/Custom/Model/ListVersionsResponse.cs
 rename sdk/src/Services/S3/{Generated/Model/PutBucketAclRequest.cs => Custom/Model/PutBucketACLRequest.cs} (88%)
 rename sdk/src/Services/S3/{Generated/Model/PutBucketAclResponse.cs => Custom/Model/PutBucketACLResponse.cs} (90%)
 rename sdk/src/Services/S3/{Generated => Custom}/Model/PutCORSConfigurationRequest.cs (53%)
 rename sdk/src/Services/S3/{Generated => Custom}/Model/PutCORSConfigurationResponse.cs (74%)
 rename sdk/src/Services/S3/{Generated/Model/PutObjectAclRequest.cs => Custom/Model/PutObjectACLRequest.cs} (89%)
 rename sdk/src/Services/S3/{Generated/Model/PutObjectAclResponse.cs => Custom/Model/PutObjectACLResponse.cs} (90%)
 rename sdk/src/Services/S3/{Generated => Custom}/Model/RestoreStatus.cs (59%)
 delete mode 100644 sdk/src/Services/S3/Generated/Model/CommonPrefix.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/DeleteMarkerEntry.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/GetObjectMetadataRequest.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/GetObjectMetadataResponse.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/CommonPrefixUnmarshaller.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteMarkerEntryUnmarshaller.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectMetadataRequestMarshaller.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectMetadataResponseUnmarshaller.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListObjectsV2RequestMarshaller.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListObjectsV2ResponseUnmarshaller.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListVersionsRequestMarshaller.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListVersionsResponseUnmarshaller.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutCORSConfigurationRequestMarshaller.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutCORSConfigurationResponseUnmarshaller.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/S3ObjectUnmarshaller.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/S3ObjectVersionUnmarshaller.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/ListVersionsResponse.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/S3AccessControlList.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/S3Object.cs
 delete mode 100644 sdk/src/Services/S3/Generated/Model/S3ObjectVersion.cs

diff --git a/generator/.DevConfigs/79b46eff-9dd1-4281-88f0-22c700a96506.json b/generator/.DevConfigs/79b46eff-9dd1-4281-88f0-22c700a96506.json
deleted file mode 100644
index d91219099c9a..000000000000
--- a/generator/.DevConfigs/79b46eff-9dd1-4281-88f0-22c700a96506.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "core": {
-    "updateMinimum": true,
-    "type": "patch",
-    "changeLogMessages": [
-      "Remove extra Content MD5 setting in BaseMarshaller. Minor Xml namespace logic updates. Update all rest-xml service response unmarshallers to generate partial method PostUnmarshallCustomization. Generator updates."
-    ]
-  },
-  "services": [
-    {
-      "serviceName": "S3",
-      "type": "patch",
-      "changeLogMessages": [
-        "Generate PutBucketAcl PutBucketCors,PutObjectAcl, GetObjectAcl, ListObjectsV2, ListVersions, HeadObject.",
-        "As part of generating S3, all response unmarshallers will implement UnmarshallException. GetObjectACL will now throw NoSuchKeyException if no such key exists. This is not a breaking change."
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/generator/ServiceClientGeneratorLib/Customizations.cs b/generator/ServiceClientGeneratorLib/Customizations.cs
index 6b30418d8242..0ef0183934c8 100644
--- a/generator/ServiceClientGeneratorLib/Customizations.cs
+++ b/generator/ServiceClientGeneratorLib/Customizations.cs
@@ -809,20 +809,6 @@ public PropertyModifier GetPropertyModifier(string shapeName, string propertyNam
             return null;
         }
 
-        /// <summary>
-        /// Gets the property modifier for a property if it exists. Otherwise returns false.
-        /// </summary>
-        /// <param name="shapeName"></param>
-        /// <param name="propertyName"></param>
-        /// <param name="propertyModifier"></param>
-        /// <returns></returns>
-        public bool TryGetPropertyModifier(string shapeName, string propertyName, out PropertyModifier propertyModifier)
-        {
-            propertyModifier = null;
-            propertyModifier = GetPropertyModifier(shapeName, propertyName) ?? null;
-            return propertyModifier != null ? true : false;
-        }
-
         /// <summary>
         /// Determines if the property has a customization to be set to nullable
         /// </summary>
@@ -1034,7 +1020,6 @@ public class ShapeModifier
             public const string ShapeModifierXmlNamespaceKey = "xmlNamespace";
             public const string OriginalMemberIsOutsideContainingShapeKey = "originalMemberIsOutsideContainingShape";
             public const string PredicateListUnmarshallersKey = "predicateListUnmarshallers";
-            public const string ExcludeFromUnmarshallingKey = "excludeFromUnmarshalling";
 
             private readonly HashSet<string> _excludedProperties;
             private readonly Dictionary<string, JsonData> _modifiedProperties;
@@ -1045,7 +1030,6 @@ public class ShapeModifier
             private readonly HashSet<string> _shapeDocumentation;
             private readonly string _shapeModifierXmlNamespace;
             private readonly Dictionary<string, JsonData> _predicateListUnmarshallers;
-            private readonly HashSet<string> _excludedUnmarshallingProperties;
 
             public string DeprecationMessage { get; private set; }
 
@@ -1065,7 +1049,6 @@ public ShapeModifier(JsonData data)
                 _shapeDocumentation = ParseShapeDocumentation(data);
                 _shapeModifierXmlNamespace = ParseXmlNamespace(data);
                 _predicateListUnmarshallers = ParsePredicateListUnmarshallers(data);
-                _excludedUnmarshallingProperties = ParseExcludedUnmarshallingProperties(data);
                 Validate(data);
             }
 
@@ -1334,7 +1317,6 @@ private static Dictionary<string, JsonData> ParsePredicateListUnmarshallers(Json
                     ?? new Dictionary<string, JsonData>();
 
             }
-
             /// <summary>
             /// This customization tells the generator that the member's shape is a filter type that has predicates
             /// and operators and that it should be unmarshalled with the PredicateListUnmarshaller type that each
@@ -1345,35 +1327,6 @@ private static Dictionary<string, JsonData> ParsePredicateListUnmarshallers(Json
             public Dictionary<string, JsonData> PredicateListUnmarshallers { get { return _predicateListUnmarshallers; } }
 
             #endregion
-
-            #region ExcludedUnmarshallingProperties
-
-            private static HashSet<string> ParseExcludedUnmarshallingProperties(JsonData data)
-            {
-                var excludedUnmarshallingProperties = data[ShapeModifier.ExcludeFromUnmarshallingKey]?.Cast<object>()
-                    .Select(x => x.ToString());
-
-                return new HashSet<string>(excludedUnmarshallingProperties ?? new string[0]);
-            }
-
-            /// <summary>
-            /// Properties that should be excluded from unmarshalling. Example usage:
-            /// 
-            /// The members that should be excluded are in the array.
-            /// "S3Grantee":{
-            /// "modify": [
-            ///     {
-            ///        "ID": {"emitPropertyName": "CanonicalUser"}
-            ///     }
-            /// ],
-            /// "excludeFromUnmarshalling":
-            ///   [
-            ///    "Type"
-            ///   ]
-            /// },
-            /// </summary>
-            public HashSet<string> ExcludedUnmarshallingProperties { get { return _excludedUnmarshallingProperties; } }
-            #endregion
         }
 
         /// <summary>
@@ -1440,17 +1393,14 @@ public class PropertyModifier
             public const string EmitPropertyNameKey = "emitPropertyName";
             public const string LocationNameKey = "locationName";
             public const string AccessModifierKey = "accessModifier";
-            public const string InjectXmlUnmarshallCodeKey = "injectXmlUnmarshallCode";
-            public const string SkipContextTestExpressionUnmarshallingLogicKey = "skipContextTestExpressionUnmarshallingLogic";
 
             private readonly string _modelPropertyName; // for debug inspection assist
             private readonly JsonData _modifierData;
-            private readonly HashSet<string> _injectXmlUnmarshallCode;
+
             internal PropertyModifier(string modelPropertyName, JsonData modifierData)
             {
                 this._modelPropertyName = modelPropertyName;
                 this._modifierData = modifierData;
-                _injectXmlUnmarshallCode = ParseInjectXmlUnmarshallCode();
             }
 
             // The access modifier for the property. Defaults to public if not set in the customization.
@@ -1523,55 +1473,13 @@ public bool UseCustomMarshall
             }
 
             public string DeprecationMessage
-            {
+        {
                 get
-                {
-                    return _modifierData[ShapeModifier.DeprecatedMessageKey].CastToString();
-                }
-            }
-
-            private HashSet<string> ParseInjectXmlUnmarshallCode()
-            {
-                var data = _modifierData[InjectXmlUnmarshallCodeKey]?.Cast<object>()
-                    .Select(x => x.ToString());
-
-                return new HashSet<string>(data ?? new string[0]);
-            }
-
-            /// <summary>
-            /// Use this customization for rest-xml services when you want to inject some code into the "Context.TestExpression" portion 
-            /// of the member.
-            /// 
-            /// A prime example of this is here https://github.com/aws/aws-sdk-net/blob/79cbc392fc3f1c74fcdf34efd77ad681da8af328/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListObjectsV2ResponseUnmarshaller.cs#L85
-            /// How to use this customization (within the modify array of a property) :
-            /// Within the "Contents" member while this member is being unmarshalled the code in the "injectXmlUnmarshallCode" will be added line by line
-            /// right before the "continue" statement within each "context.TestExpression" call.
-            /// {
-            ///        "Contents" : {
-            ///            "emitPropertyName" : "S3Objects",
-            ///            "injectXmlUnmarshallCode":[
-            ///                "response.S3Objects[response.S3Objects.Count - 1].BucketName = response.Name;"
-            ///            ]
-            ///     }
-            /// },
-            /// </summary>
-            public HashSet<string> InjectXmlUnmarshallCode
             {
-                get { return _injectXmlUnmarshallCode; }
+                    return _modifierData[ShapeModifier.DeprecatedMessageKey].CastToString();
             }
-
-            /// <summary>
-            /// If this is set, all the logic inside of the "context.testExpression" code block for that member won't be generated. this is meant 
-            /// to be used in conjunction with InjectXmlUnmarshallCode, but can be used separately as well. For example:
-            /// "Versions":{
-            ///   "skipContextTestExpressionUnmarshallingLogic" : true,
-            ///   "injectXmlUnmarshallCode" :[
-            ///      "VersionsItemCustomUnmarshall(context, response);"
-            ///   ]
-            /// }
-            /// </summary>
-        public bool SkipContextTestExpressionUnmarshallingLogic { get { return _modifierData[SkipContextTestExpressionUnmarshallingLogicKey] != null; } }
         }
+            }
 
         #endregion
         // Injection modifier is an array of objects, each object being the
diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseMarshaller.cs b/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseMarshaller.cs
index 8d75c8cb7285..65cd8be7db2e 100644
--- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseMarshaller.cs
+++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseMarshaller.cs
@@ -3335,6 +3335,59 @@ protected void ProcessEndpointHostPrefixMembers(int level, string variableName,
 
 	protected void GenerateRequestChecksumHandling(Operation operation, string requestContent) 
     {
+        // If the request has a Content-MD5 property and it's set by the user, copy the value to the header.
+        // Otherwise the checksum handling in Core will calculate and set MD5 later.
+        if (operation.HttpChecksumRequired) 
+        {
+            var member = operation.RequestStructure.Members.FirstOrDefault(m => string.Equals(m.LocationName, "Content-MD5"));
+            if (member != default(Member)) 
+            {
+
+        
+        #line default
+        #line hidden
+        
+        #line 505 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+this.Write("                if (publicRequest.IsSet");
+
+        
+        #line default
+        #line hidden
+        
+        #line 506 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
+
+        
+        #line default
+        #line hidden
+        
+        #line 506 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+this.Write("())\r\n                    request.Headers[Amazon.Util.HeaderKeys.ContentMD5Header]" +
+        " = publicRequest.");
+
+        
+        #line default
+        #line hidden
+        
+        #line 507 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
+
+        
+        #line default
+        #line hidden
+        
+        #line 507 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+this.Write(";\r\n");
+
+        
+        #line default
+        #line hidden
+        
+        #line 508 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+
+            }
+        }
+        
         if (operation.RequiresChecksumDuringMarshalling)
         {
             if (operation.ChecksumConfiguration != null && !string.IsNullOrEmpty(operation.ChecksumConfiguration.RequestAlgorithmMember))
@@ -3355,11 +3408,14 @@ protected void GenerateRequestChecksumHandling(Operation operation, string reque
                     headerName = member.MarshallLocation == MarshallLocation.Header ? member.MarshallLocationName : string.Empty;
                 }
 
+
+
+
         
         #line default
         #line hidden
         
-        #line 517 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+        #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
 this.Write("                ChecksumUtils.SetChecksumData(\r\n                    request,\r\n   " +
         "                 publicRequest.");
 
@@ -3367,14 +3423,14 @@ protected void GenerateRequestChecksumHandling(Operation operation, string reque
         #line default
         #line hidden
         
-        #line 520 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+        #line 537 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(operation.ChecksumConfiguration.RequestAlgorithmMember));
 
         
         #line default
         #line hidden
         
-        #line 520 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+        #line 537 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
 this.Write(",\r\n                    fallbackToMD5: false,\r\n                    isRequestChecks" +
         "umRequired: ");
 
@@ -3382,35 +3438,35 @@ protected void GenerateRequestChecksumHandling(Operation operation, string reque
         #line default
         #line hidden
         
-        #line 522 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+        #line 539 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(operation.ChecksumConfiguration.RequestChecksumRequired.ToString().ToLower()));
 
         
         #line default
         #line hidden
         
-        #line 522 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+        #line 539 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
 this.Write(",\r\n                    headerName: \"");
 
         
         #line default
         #line hidden
         
-        #line 523 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+        #line 540 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(headerName));
 
         
         #line default
         #line hidden
         
-        #line 523 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+        #line 540 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
 this.Write("\"\r\n                );\r\n");
 
         
         #line default
         #line hidden
         
-        #line 525 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+        #line 542 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
 
             }
             // When checksum is configured without an algorithm member, let the SDK pick the best available option (without falling back to MD5).
@@ -3421,7 +3477,7 @@ protected void GenerateRequestChecksumHandling(Operation operation, string reque
         #line default
         #line hidden
         
-        #line 530 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+        #line 547 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
 this.Write("                ChecksumUtils.SetChecksumData(request, checksumAlgorithm: null, f" +
         "allbackToMD5: false, isRequestChecksumRequired: ");
 
@@ -3429,21 +3485,21 @@ protected void GenerateRequestChecksumHandling(Operation operation, string reque
         #line default
         #line hidden
         
-        #line 531 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+        #line 548 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(operation.ChecksumConfiguration.RequestChecksumRequired.ToString().ToLower()));
 
         
         #line default
         #line hidden
         
-        #line 531 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+        #line 548 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
 this.Write(");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 532 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+        #line 549 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
 
             }
             // This is the legacy trait ("httpChecksumRequired"), which does not use flexible checksums (just MD5).
@@ -3455,14 +3511,14 @@ protected void GenerateRequestChecksumHandling(Operation operation, string reque
         #line default
         #line hidden
         
-        #line 538 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+        #line 555 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
 this.Write("                ChecksumUtils.SetChecksumData(request);\r\n");
 
         
         #line default
         #line hidden
         
-        #line 540 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+        #line 557 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
 
             }
         }
@@ -3485,7 +3541,7 @@ protected void SetCompressionAlgorithmEncoding(Operation operation)
         #line default
         #line hidden
         
-        #line 557 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+        #line 574 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
 this.Write("            CompressionAlgorithmUtils.SetCompressionAlgorithm(request, Compressio" +
         "nEncodingAlgorithm.");
 
@@ -3493,21 +3549,21 @@ protected void SetCompressionAlgorithmEncoding(Operation operation)
         #line default
         #line hidden
         
-        #line 558 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+        #line 575 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(encoding.ToString()));
 
         
         #line default
         #line hidden
         
-        #line 558 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+        #line 575 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
 this.Write(");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 559 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
+        #line 576 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt"
 
             }
         }
diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseMarshaller.tt b/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseMarshaller.tt
index 05d6e486c6da..95521edd61cd 100644
--- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseMarshaller.tt
+++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseMarshaller.tt
@@ -495,6 +495,20 @@ using Amazon.Runtime.Internal.Util;
 
 	protected void GenerateRequestChecksumHandling(Operation operation, string requestContent) 
     {
+        // If the request has a Content-MD5 property and it's set by the user, copy the value to the header.
+        // Otherwise the checksum handling in Core will calculate and set MD5 later.
+        if (operation.HttpChecksumRequired) 
+        {
+            var member = operation.RequestStructure.Members.FirstOrDefault(m => string.Equals(m.LocationName, "Content-MD5"));
+            if (member != default(Member)) 
+            {
+#>
+                if (publicRequest.IsSet<#=member.PropertyName#>())
+                    request.Headers[Amazon.Util.HeaderKeys.ContentMD5Header] = publicRequest.<#=member.PropertyName#>;
+<#+
+            }
+        }
+        
         if (operation.RequiresChecksumDuringMarshalling)
         {
             if (operation.ChecksumConfiguration != null && !string.IsNullOrEmpty(operation.ChecksumConfiguration.RequestAlgorithmMember))
@@ -514,6 +528,9 @@ using Amazon.Runtime.Internal.Util;
                     var member = operation.RequestStructure.Members.FirstOrDefault(m => string.Equals(m.PropertyName, operation.ChecksumConfiguration.RequestAlgorithmMember));
                     headerName = member.MarshallLocation == MarshallLocation.Header ? member.MarshallLocationName : string.Empty;
                 }
+
+
+
 #>
                 ChecksumUtils.SetChecksumData(
                     request,
diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.cs b/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.cs
index c85d929564b3..b7e9aab96c19 100644
--- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.cs
+++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.cs
@@ -305,8 +305,6 @@ protected void UnmarshallHeaders()
 		{
 			foreach (var member in this.Operation.ResponseHeaderMembers)
 			{
-				if (this.Config.ServiceModel.Customizations.ShapeModifiers.TryGetValue(member.OwningShape.Name, out var modifier) && modifier.ExcludedUnmarshallingProperties.Contains(member.ModeledName))
-					continue;
 				if (member.Shape.IsMap)
 				{
 
@@ -314,28 +312,28 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 155 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 153 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t//Map of headers with prefix \"");
 
         
         #line default
         #line hidden
         
-        #line 156 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 154 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 156 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 154 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\".\r\n");
 
         
         #line default
         #line hidden
         
-        #line 157 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 155 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
  
 					// Dictionary<string, string>
 					if (member.ModelShape.ValueShape.IsString)
@@ -345,182 +343,182 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 161 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 159 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("            var headersFor");
 
         
         #line default
         #line hidden
         
-        #line 162 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 160 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 162 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 160 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = new Dictionary<string, string>();\r\n\t\t\tforeach (var name");
 
         
         #line default
         #line hidden
         
-        #line 163 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 161 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 163 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 161 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" in context.ResponseData.GetHeaderNames())\r\n\t\t\t{\r\n\t\t\t\tvar keyToUse = name");
 
         
         #line default
         #line hidden
         
-        #line 165 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 163 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 165 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 163 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(";\r\n\t\t\t\tif(\"");
 
         
         #line default
         #line hidden
         
-        #line 166 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 164 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 166 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 164 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\".Length > 0 && keyToUse.StartsWith(\"");
 
         
         #line default
         #line hidden
         
-        #line 166 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 164 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 166 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 164 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\")) {\r\n\t\t\t\t\tkeyToUse = keyToUse.Substring(\"");
 
         
         #line default
         #line hidden
         
-        #line 167 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 165 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 167 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 165 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\".Length);\r\n\t\t\t\t}\r\n\r\n\t\t\t\tif (context.ResponseData.IsHeaderPresent($\"");
 
         
         #line default
         #line hidden
         
-        #line 170 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 168 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 170 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 168 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("{keyToUse}\"))\r\n\t\t\t\t{\r\n\t\t\t\t\theadersFor");
 
         
         #line default
         #line hidden
         
-        #line 172 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 170 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 172 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 170 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".Add(\r\n\t\t\t\t\t\tkeyToUse,\r\n\t\t\t\t\t\tcontext.ResponseData.GetHeaderValue($\"");
 
         
         #line default
         #line hidden
         
-        #line 174 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 172 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 174 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 172 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("{keyToUse}\")\r\n\t\t\t\t\t);\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tif(headersFor");
 
         
         #line default
         #line hidden
         
-        #line 178 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 176 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 178 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 176 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".Count > 0)\r\n\t\t\t\tresponse.");
 
         
         #line default
         #line hidden
         
-        #line 179 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 177 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 179 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 177 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = headersFor");
 
         
         #line default
         #line hidden
         
-        #line 179 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 177 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 179 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 177 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(";\r\n");
 
         
         #line default
         #line hidden
         
-        #line 180 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 178 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
                     }
                     // Dictionary<string, List<string>>
@@ -531,182 +529,182 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 185 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 183 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t var headersFor");
 
         
         #line default
         #line hidden
         
-        #line 186 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 184 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 186 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 184 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = new Dictionary<string, List<string>>();\r\n\t\t\tforeach (var name");
 
         
         #line default
         #line hidden
         
-        #line 187 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 185 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 187 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 185 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" in context.ResponseData.GetHeaderNames())\r\n\t\t\t{\r\n\t\t\t\tvar keyToUse = name");
 
         
         #line default
         #line hidden
         
-        #line 189 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 187 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 189 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 187 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(";\r\n\t\t\t\tif(\"");
 
         
         #line default
         #line hidden
         
-        #line 190 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 188 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 190 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 188 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\".Length > 0 && keyToUse.StartsWith(\"");
 
         
         #line default
         #line hidden
         
-        #line 190 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 188 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 190 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 188 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\")) {\r\n\t\t\t\t\tkeyToUse = keyToUse.Substring(\"");
 
         
         #line default
         #line hidden
         
-        #line 191 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 189 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 191 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 189 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\".Length);\r\n\t\t\t\t}\r\n\r\n\t\t\t\tif (context.ResponseData.IsHeaderPresent($\"");
 
         
         #line default
         #line hidden
         
-        #line 194 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 192 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 194 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 192 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("{keyToUse}\"))\r\n\t\t\t\t{\r\n\t\t\t\t\theadersFor");
 
         
         #line default
         #line hidden
         
-        #line 196 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 194 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 196 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 194 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".Add(\r\n\t\t\t\t\t\tkeyToUse,\r\n\t\t\t\t\t\tcontext.ResponseData.GetHeaderValue($\"");
 
         
         #line default
         #line hidden
         
-        #line 198 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 196 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 198 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 196 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("{keyToUse}\").Split(\',\').ToList()\r\n\t\t\t\t\t);\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tif(headersFor");
 
         
         #line default
         #line hidden
         
-        #line 202 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 200 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 202 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 200 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".Count > 0)\r\n\t\t\t\tresponse.");
 
         
         #line default
         #line hidden
         
-        #line 203 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 201 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 203 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 201 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = headersFor");
 
         
         #line default
         #line hidden
         
-        #line 203 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 201 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 203 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 201 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(";\r\n");
 
         
         #line default
         #line hidden
         
-        #line 204 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 202 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
                     }
                     else
@@ -718,7 +716,7 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 211 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 209 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 					continue;
 				}
@@ -727,28 +725,28 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 214 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 212 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\tif (context.ResponseData.IsHeaderPresent(\"");
 
         
         #line default
         #line hidden
         
-        #line 215 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 213 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 215 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 213 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\"))\r\n");
 
         
         #line default
         #line hidden
         
-        #line 216 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 214 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 				if (member.Shape.IsString)
 				{
@@ -759,7 +757,7 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 221 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 219 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t{\r\n\t\t\t\tvar headerBytes = Convert.FromBase64String(context.ResponseData.GetHead" +
         "erValue(\"");
 
@@ -767,35 +765,35 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 223 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 221 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 223 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 221 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\"));\r\n\t\t\t\tresponse.");
 
         
         #line default
         #line hidden
         
-        #line 224 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 222 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 224 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 222 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = Encoding.UTF8.GetString(headerBytes, 0, headerBytes.Length);\r\n\t\t\t}\r\n");
 
         
         #line default
         #line hidden
         
-        #line 226 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 224 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 					}
 					else
@@ -805,42 +803,42 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 230 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 228 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\tresponse.");
 
         
         #line default
         #line hidden
         
-        #line 231 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 229 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 231 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 229 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = context.ResponseData.GetHeaderValue(\"");
 
         
         #line default
         #line hidden
         
-        #line 231 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 229 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 231 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 229 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 232 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 230 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 					}
 				}
@@ -851,28 +849,28 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 237 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 235 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t//Map of headers with prefix \"");
 
         
         #line default
         #line hidden
         
-        #line 238 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 236 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 238 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 236 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\".\r\n\r\n");
 
         
         #line default
         #line hidden
         
-        #line 240 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 238 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
  
 					// Dictionary<string, string>
                     if (member.ModelShape.ValueShape.IsString)
@@ -882,182 +880,182 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 244 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 242 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("            var headersFor");
 
         
         #line default
         #line hidden
         
-        #line 245 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 243 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 245 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 243 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = new Dictionary<string, string>();\r\n\t\t\tforeach (var name");
 
         
         #line default
         #line hidden
         
-        #line 246 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 244 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 246 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 244 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" in context.ResponseData.GetHeaderNames())\r\n\t\t\t{\r\n\t\t\t\tvar keyToUse = name");
 
         
         #line default
         #line hidden
         
-        #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 246 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 246 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(";\r\n\t\t\t\tif(\"");
 
         
         #line default
         #line hidden
         
-        #line 249 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 247 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 249 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 247 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\".Length > 0 && keyToUse.StartsWith(\"");
 
         
         #line default
         #line hidden
         
-        #line 249 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 247 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 249 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 247 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\")) {\r\n\t\t\t\t\tkeyToUse = keyToUse.Substring(\"");
 
         
         #line default
         #line hidden
         
-        #line 250 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 250 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\".Length);\r\n\t\t\t\t}\r\n\r\n\t\t\t\tif (context.ResponseData.IsHeaderPresent($\"");
 
         
         #line default
         #line hidden
         
-        #line 253 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 251 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 253 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 251 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("{keyToUse}\"))\r\n\t\t\t\t{\r\n\t\t\t\t\theadersFor");
 
         
         #line default
         #line hidden
         
-        #line 255 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 253 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 255 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 253 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".Add(\r\n\t\t\t\t\t\tkeyToUse,\r\n\t\t\t\t\t\tcontext.ResponseData.GetHeaderValue($\"");
 
         
         #line default
         #line hidden
         
-        #line 257 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 255 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 257 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 255 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("{keyToUse}\")\r\n\t\t\t\t\t);\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tif(headersFor");
 
         
         #line default
         #line hidden
         
-        #line 261 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 259 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 261 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 259 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".Count > 0)\r\n\t\t\t\tresponse.");
 
         
         #line default
         #line hidden
         
-        #line 262 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 260 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 262 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 260 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = headersFor");
 
         
         #line default
         #line hidden
         
-        #line 262 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 260 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 262 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 260 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(";\r\n");
 
         
         #line default
         #line hidden
         
-        #line 263 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 261 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
                     }
                     // Dictionary<string, List<string>>
@@ -1068,182 +1066,182 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 268 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 266 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t var headersFor");
 
         
         #line default
         #line hidden
         
-        #line 269 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 267 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 269 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 267 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = new Dictionary<string, List<string>>();\r\n\t\t\tforeach (var name");
 
         
         #line default
         #line hidden
         
-        #line 270 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 268 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 270 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 268 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" in context.ResponseData.GetHeaderNames())\r\n\t\t\t{\r\n\t\t\t\tvar keyToUse = name");
 
         
         #line default
         #line hidden
         
-        #line 272 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 270 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 272 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 270 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(";\r\n\t\t\t\tif(\"");
 
         
         #line default
         #line hidden
         
-        #line 273 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 271 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 273 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 271 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\".Length > 0 && keyToUse.StartsWith(\"");
 
         
         #line default
         #line hidden
         
-        #line 273 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 271 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 273 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 271 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\")) {\r\n\t\t\t\t\tkeyToUse = keyToUse.Substring(\"");
 
         
         #line default
         #line hidden
         
-        #line 274 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 272 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 274 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 272 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\".Length);\r\n\t\t\t\t}\r\n\r\n\t\t\t\tif (context.ResponseData.IsHeaderPresent($\"");
 
         
         #line default
         #line hidden
         
-        #line 277 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 275 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 277 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 275 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("{keyToUse}\"))\r\n\t\t\t\t{\r\n\t\t\t\t\theadersFor");
 
         
         #line default
         #line hidden
         
-        #line 279 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 277 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 279 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 277 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".Add(\r\n\t\t\t\t\t\tkeyToUse,\r\n\t\t\t\t\t\tcontext.ResponseData.GetHeaderValue($\"");
 
         
         #line default
         #line hidden
         
-        #line 281 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 279 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 281 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 279 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("{keyToUse}\").Split(\',\').ToList()\r\n\t\t\t\t\t);\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tif(headersFor");
 
         
         #line default
         #line hidden
         
-        #line 285 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 283 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 285 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 283 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".Count > 0)\r\n\t\t\t\tresponse.");
 
         
         #line default
         #line hidden
         
-        #line 286 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 284 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 286 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 284 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = headersFor");
 
         
         #line default
         #line hidden
         
-        #line 286 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 284 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 286 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 284 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(";\r\n");
 
         
         #line default
         #line hidden
         
-        #line 287 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 285 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
                     }
                     else
@@ -1255,7 +1253,7 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 295 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 293 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 				}
 				else if (member.Shape.IsList)
@@ -1271,42 +1269,42 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 305 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 303 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\tresponse.");
 
         
         #line default
         #line hidden
         
-        #line 306 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 304 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 306 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 304 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = MultiValueHeaderParser.ToStringList(context.ResponseData.GetHeaderValue(\"");
 
         
         #line default
         #line hidden
         
-        #line 306 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 304 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 306 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 304 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\"));\r\n");
 
         
         #line default
         #line hidden
         
-        #line 307 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 305 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 					}
 					else if(member.Shape.ListShape.IsTimeStamp)
@@ -1319,56 +1317,56 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 314 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 312 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\tresponse.");
 
         
         #line default
         #line hidden
         
-        #line 315 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 315 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = MultiValueHeaderParser.ToDateTimeList(context.ResponseData.GetHeaderValue(\"");
 
         
         #line default
         #line hidden
         
-        #line 315 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 315 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\"), \"");
 
         
         #line default
         #line hidden
         
-        #line 315 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(timestampFormat));
 
         
         #line default
         #line hidden
         
-        #line 315 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 316 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 314 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 						}
 						else
@@ -1384,56 +1382,56 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 326 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 324 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\tresponse.");
 
         
         #line default
         #line hidden
         
-        #line 327 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 325 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 327 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 325 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = MultiValueHeaderParser.ToValueTypeList<");
 
         
         #line default
         #line hidden
         
-        #line 327 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 325 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ListShape.GetPrimitiveType().ToLower()));
 
         
         #line default
         #line hidden
         
-        #line 327 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 325 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(">(context.ResponseData.GetHeaderValue(\"");
 
         
         #line default
         #line hidden
         
-        #line 327 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 325 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 327 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 325 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\"));\r\n");
 
         
         #line default
         #line hidden
         
-        #line 328 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 326 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 					
 					}
 					else
@@ -1451,35 +1449,35 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 340 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 338 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\tresponse.");
 
         
         #line default
         #line hidden
         
-        #line 341 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 339 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 341 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 339 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = DateTime.Parse(context.ResponseData.GetHeaderValue(\"");
 
         
         #line default
         #line hidden
         
-        #line 341 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 339 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 341 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 339 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles" +
         ".AdjustToUniversal);\r\n");
 
@@ -1487,7 +1485,7 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 342 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 340 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 					}
 					else if(member.TimestampFormat == TimestampFormat.UnixTimestamp)
@@ -1497,21 +1495,21 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 346 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 344 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\tresponse.");
 
         
         #line default
         #line hidden
         
-        #line 347 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 345 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 347 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 345 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = Amazon.Util.AWSSDKUtils.ConvertFromUnixEpochSeconds(int.Parse(context.Response" +
         "Data.GetHeaderValue(\"");
 
@@ -1519,21 +1517,21 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 347 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 345 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 347 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 345 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\"), CultureInfo.InvariantCulture));\r\n");
 
         
         #line default
         #line hidden
         
-        #line 348 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 346 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 					
 					}
 					else
@@ -1548,77 +1546,77 @@ protected void UnmarshallHeaders()
         #line default
         #line hidden
         
-        #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 355 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\tresponse.");
 
         
         #line default
         #line hidden
         
-        #line 358 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 356 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 358 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 356 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = ");
 
         
         #line default
         #line hidden
         
-        #line 358 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 356 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.GetPrimitiveType().ToLower()));
 
         
         #line default
         #line hidden
         
-        #line 358 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 356 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".Parse(context.ResponseData.GetHeaderValue(\"");
 
         
         #line default
         #line hidden
         
-        #line 358 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 356 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName));
 
         
         #line default
         #line hidden
         
-        #line 358 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 356 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\")");
 
         
         #line default
         #line hidden
         
-        #line 358 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 356 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture((member.Shape.IsBoolean)?"":", CultureInfo.InvariantCulture"));
 
         
         #line default
         #line hidden
         
-        #line 358 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 356 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture((!member.Shape.IsTimeStamp)?"":", DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal"));
 
         
         #line default
         #line hidden
         
-        #line 358 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 356 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 359 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 				}
 				else
@@ -1639,28 +1637,28 @@ protected void ProcessStatusCode()
         #line default
         #line hidden
         
-        #line 374 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 372 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\tresponse.");
 
         
         #line default
         #line hidden
         
-        #line 375 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 373 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.ResponseStatusCodeMember.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 375 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 373 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = (int)context.ResponseData.StatusCode;\r\n");
 
         
         #line default
         #line hidden
         
-        #line 376 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 374 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 						
 		}
 	}
@@ -1669,7 +1667,7 @@ protected void ProcessStatusCode()
         #line default
         #line hidden
         
-        #line 380 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 378 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
     /* The rules for determining the marshallName for xml-based services is different than json services. Xml based
 		services are defined as any service which marshalls/unmarshalls an xml document. This includes AWSQueryResponse,
@@ -1722,18 +1720,17 @@ protected string DetermineXmlMarshallName(Member member, bool withPrefix = true)
         #line default
         #line hidden
         
-        #line 429 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 427 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 /// Only to be used by rest-xml response unmarshallers
 	protected void ProcessResponseBodyOrStructureMembers(Member member, bool isStructure, Shape topLevelShape)
 	{
-		bool skipXmlTestExpression = false, isDataTypeSwapList = false, dataTypeSwapIsFlattened = false, skipXmlTestExpressionInnerLogic = false;
+		bool skipXmlTestExpression = false, isDataTypeSwapList = false, dataTypeSwapIsFlattened = false;
 
 		if (this.Config.ServiceModel.Customizations.ShapeModifiers.TryGetValue(topLevelShape.Name, out var modifier) && modifier.SkipXmlTestExpressionProperties.Contains(member.ModeledName))
 			skipXmlTestExpression = true;
 
-		if (this.Config.ServiceModel.Customizations.TryGetPropertyModifier(member.OwningShape.Name, member.ModeledName, out var propModifier) && propModifier.SkipContextTestExpressionUnmarshallingLogic)
-			skipXmlTestExpressionInnerLogic = true;
+
 		if (this.Config.ServiceModel.Customizations.OverrideDataType(topLevelShape.Name, member.ModeledName) != null)
 		{
 			var dataTypeOverride = this.Config.ServiceModel.Customizations.OverrideDataType(topLevelShape.Name, member.ModeledName);
@@ -1755,178 +1752,155 @@ protected void ProcessResponseBodyOrStructureMembers(Member member, bool isStruc
         #line default
         #line hidden
         
-        #line 456 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 453 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\t\tif (context.TestExpression(\"");
 
         
         #line default
         #line hidden
         
-        #line 457 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 454 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(DetermineXmlMarshallName(member)));
 
         
         #line default
         #line hidden
         
-        #line 457 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 454 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\", targetDepth))\r\n\t\t\t\t\t{\r\n");
 
         
         #line default
         #line hidden
         
-        #line 459 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 456 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 				}
-				if (!skipXmlTestExpressionInnerLogic)
-				{
 
         
         #line default
         #line hidden
         
-        #line 463 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 458 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("                        if (");
 
         
         #line default
         #line hidden
         
-        #line 464 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 459 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(unmarshalledVariable));
 
         
         #line default
         #line hidden
         
-        #line 464 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 459 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 464 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 459 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 464 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 459 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" == null)\r\n                        {\r\n                            ");
 
         
         #line default
         #line hidden
         
-        #line 466 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 461 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(unmarshalledVariable));
 
         
         #line default
         #line hidden
         
-        #line 466 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 461 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 466 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 461 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 466 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 461 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = new ");
 
         
         #line default
         #line hidden
         
-        #line 466 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 461 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineType()));
 
         
         #line default
         #line hidden
         
-        #line 466 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 461 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("();\r\n                        }\r\n\t\t\t\t\t\tvar unmarshaller = ");
 
         
         #line default
         #line hidden
         
-        #line 468 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 463 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineTypeUnmarshallerInstantiate()));
 
         
         #line default
         #line hidden
         
-        #line 468 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 463 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(";\r\n\t\t\t\t\t\t");
 
         
         #line default
         #line hidden
         
-        #line 469 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 464 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(unmarshalledVariable));
 
         
         #line default
         #line hidden
         
-        #line 469 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 464 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 469 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 464 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 469 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-this.Write(".Add(unmarshaller.Unmarshall(context));\r\n");
-
-        
-        #line default
-        #line hidden
-        
-        #line 470 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-
-				}
-
-        
-        #line default
-        #line hidden
-        
-        #line 473 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-WriteInjectXmlUnmarshallCode(member);
-        
-        #line default
-        #line hidden
-        
-        #line 473 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-this.Write("\t\t\t\t\t\tcontinue;\r\n");
+        #line 464 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+this.Write(".Add(unmarshaller.Unmarshall(context));\r\n\t\t\t\t\t\tcontinue;\r\n");
 
         
         #line default
         #line hidden
         
-        #line 475 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 466 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 				if (!skipXmlTestExpression)
 				{
@@ -1935,14 +1909,14 @@ protected void ProcessResponseBodyOrStructureMembers(Member member, bool isStruc
         #line default
         #line hidden
         
-        #line 478 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 469 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\t\t}\r\n");
 
         
         #line default
         #line hidden
         
-        #line 480 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 471 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 				}
 			}
@@ -1955,192 +1929,169 @@ protected void ProcessResponseBodyOrStructureMembers(Member member, bool isStruc
         #line default
         #line hidden
         
-        #line 487 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 478 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\t    if (context.TestExpression(\"");
 
         
         #line default
         #line hidden
         
-        #line 488 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 479 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(DetermineXmlMarshallName(member)));
 
         
         #line default
         #line hidden
         
-        #line 488 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 479 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("/");
 
         
         #line default
         #line hidden
         
-        #line 488 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 479 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(listMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 488 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 479 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\", targetDepth))\r\n\t\t\t\t    {\r\n");
 
         
         #line default
         #line hidden
         
-        #line 490 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 481 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 				}
-				if (!skipXmlTestExpressionInnerLogic)
-				{				
 
         
         #line default
         #line hidden
         
-        #line 494 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 483 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("                        if (");
 
         
         #line default
         #line hidden
         
-        #line 495 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 484 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(unmarshalledVariable));
 
         
         #line default
         #line hidden
         
-        #line 495 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 484 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 495 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 484 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 495 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 484 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" == null)\r\n                        {\r\n                            ");
 
         
         #line default
         #line hidden
         
-        #line 497 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 486 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(unmarshalledVariable));
 
         
         #line default
         #line hidden
         
-        #line 497 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 486 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 497 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 486 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 497 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 486 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = new ");
 
         
         #line default
         #line hidden
         
-        #line 497 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 486 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineType()));
 
         
         #line default
         #line hidden
         
-        #line 497 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 486 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("();\r\n                        }\r\n\t\t\t\t\t    var unmarshaller = ");
 
         
         #line default
         #line hidden
         
-        #line 499 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 488 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineTypeUnmarshallerInstantiate()));
 
         
         #line default
         #line hidden
         
-        #line 499 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 488 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(";\r\n\t\t\t\t\t    ");
 
         
         #line default
         #line hidden
         
-        #line 500 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 489 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(unmarshalledVariable));
 
         
         #line default
         #line hidden
         
-        #line 500 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 489 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 500 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 489 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 500 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-this.Write(".Add(unmarshaller.Unmarshall(context));\r\n");
-
-        
-        #line default
-        #line hidden
-        
-        #line 501 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-
-				}
+        #line 489 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+this.Write(".Add(unmarshaller.Unmarshall(context));\r\n\t\t\t\t\t    continue;\r\n");
 
         
         #line default
         #line hidden
         
-        #line 504 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-WriteInjectXmlUnmarshallCode(member);
-        
-        #line default
-        #line hidden
-        
-        #line 504 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-this.Write("\t\t\t\t\t    continue;\r\n");
-
-        
-        #line default
-        #line hidden
-        
-        #line 506 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 491 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 				if (!skipXmlTestExpression)
 				{
@@ -2149,14 +2100,14 @@ protected void ProcessResponseBodyOrStructureMembers(Member member, bool isStruc
         #line default
         #line hidden
         
-        #line 509 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 494 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\t    }\r\n");
 
         
         #line default
         #line hidden
         
-        #line 511 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 496 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 				}
 			}
@@ -2172,150 +2123,127 @@ protected void ProcessResponseBodyOrStructureMembers(Member member, bool isStruc
         #line default
         #line hidden
         
-        #line 521 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 506 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\t\tif (context.TestExpression(\"");
 
         
         #line default
         #line hidden
         
-        #line 522 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 507 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(DetermineXmlMarshallName(member)));
 
         
         #line default
         #line hidden
         
-        #line 522 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 507 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\", targetDepth))\r\n\t\t\t\t\t{\r\n");
 
         
         #line default
         #line hidden
         
-        #line 524 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 509 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 				}
-				if (!skipXmlTestExpressionInnerLogic)
-				{
 
         
         #line default
         #line hidden
         
-        #line 528 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 511 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("                        if (response.");
 
         
         #line default
         #line hidden
         
-        #line 529 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 512 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 529 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 512 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" == null)\r\n                        {\r\n                            response.");
 
         
         #line default
         #line hidden
         
-        #line 531 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 514 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 531 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 514 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = new ");
 
         
         #line default
         #line hidden
         
-        #line 531 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 514 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineType()));
 
         
         #line default
         #line hidden
         
-        #line 531 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 514 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("();\r\n                        }\r\n\t\t\t\t\t\tvar unmarshaller = ");
 
         
         #line default
         #line hidden
         
-        #line 533 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 516 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineTypeUnmarshallerInstantiate()));
 
         
         #line default
         #line hidden
         
-        #line 533 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 516 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(";\r\n\t\t\t\t\t\t");
 
         
         #line default
         #line hidden
         
-        #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 517 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(unmarshalledVariable));
 
         
         #line default
         #line hidden
         
-        #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 517 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 517 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-this.Write(".Add(unmarshaller.Unmarshall(context));\r\n");
-
-        
-        #line default
-        #line hidden
-        
-        #line 535 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-
-				}
+        #line 517 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+this.Write(".Add(unmarshaller.Unmarshall(context));\r\n\t\t\t\t\t\tcontinue;\r\n");
 
         
         #line default
         #line hidden
         
-        #line 538 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-WriteInjectXmlUnmarshallCode(member);
-        
-        #line default
-        #line hidden
-        
-        #line 538 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-this.Write("\t\t\t\t\t\tcontinue;\r\n");
-
-        
-        #line default
-        #line hidden
-        
-        #line 540 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 519 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 				if (!skipXmlTestExpression)
 				{
@@ -2324,14 +2252,14 @@ protected void ProcessResponseBodyOrStructureMembers(Member member, bool isStruc
         #line default
         #line hidden
         
-        #line 543 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 522 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\t\t}\r\n");
 
         
         #line default
         #line hidden
         
-        #line 545 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 524 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 				}
 			}
@@ -2344,108 +2272,85 @@ protected void ProcessResponseBodyOrStructureMembers(Member member, bool isStruc
         #line default
         #line hidden
         
-        #line 552 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 531 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\t\tif (context.TestExpression(\"");
 
         
         #line default
         #line hidden
         
-        #line 553 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 532 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(DetermineXmlMarshallName(member)));
 
         
         #line default
         #line hidden
         
-        #line 553 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 532 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\", targetDepth))\r\n\t\t\t\t\t{\r\n");
 
         
         #line default
         #line hidden
         
-        #line 555 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 				}
-				if (!skipXmlTestExpressionInnerLogic)
-				{
 
         
         #line default
         #line hidden
         
-        #line 559 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 536 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\t\t\tvar unmarshaller = ");
 
         
         #line default
         #line hidden
         
-        #line 560 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 537 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineTypeUnmarshallerInstantiate()));
 
         
         #line default
         #line hidden
         
-        #line 560 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 537 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(";\r\n\t\t\t\t\t\t");
 
         
         #line default
         #line hidden
         
-        #line 561 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 538 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(unmarshalledVariable));
 
         
         #line default
         #line hidden
         
-        #line 561 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 538 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 561 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 538 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 561 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-this.Write(" = unmarshaller.Unmarshall(context);\r\n");
-
-        
-        #line default
-        #line hidden
-        
-        #line 562 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-
-				}
-
-        
-        #line default
-        #line hidden
-        
-        #line 565 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-WriteInjectXmlUnmarshallCode(member);
-        
-        #line default
-        #line hidden
-        
-        #line 565 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-this.Write("\t\t\t\t\t\tcontinue;\r\n");
+        #line 538 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+this.Write(" = unmarshaller.Unmarshall(context);\r\n\t\t\t\t\t\tcontinue;\r\n");
 
         
         #line default
         #line hidden
         
-        #line 567 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 540 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 				if (!skipXmlTestExpression)
 				{
@@ -2454,14 +2359,14 @@ protected void ProcessResponseBodyOrStructureMembers(Member member, bool isStruc
         #line default
         #line hidden
         
-        #line 570 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 543 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\t\t}\r\n");
 
         
         #line default
         #line hidden
         
-        #line 572 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 545 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 				}
 			}
@@ -2475,28 +2380,28 @@ protected void ProcessResponseBodyOrStructureMembers(Member member, bool isStruc
         #line default
         #line hidden
         
-        #line 580 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 553 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\t\tif (context.TestExpression(\"");
 
         
         #line default
         #line hidden
         
-        #line 581 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 554 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(DetermineXmlMarshallName(member)));
 
         
         #line default
         #line hidden
         
-        #line 581 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 554 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\", targetDepth))\r\n\t\t\t\t\t{\r\n");
 
         
         #line default
         #line hidden
         
-        #line 583 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 556 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 					
 			}
 			else
@@ -2508,111 +2413,88 @@ protected void ProcessResponseBodyOrStructureMembers(Member member, bool isStruc
         #line default
         #line hidden
         
-        #line 589 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 562 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("                    if (context.TestExpression(\"@");
 
         
         #line default
         #line hidden
         
-        #line 590 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 563 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(DetermineXmlMarshallName(member, false)));
 
         
         #line default
         #line hidden
         
-        #line 590 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 563 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\", targetDepth - 1))\r\n\t\t\t\t\t{\r\n");
 
         
         #line default
         #line hidden
         
-        #line 592 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 565 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 				}
 			}
 			if (!member.HasPredicateListUnmarshaller)
 			{
-				if (!skipXmlTestExpressionInnerLogic)
-				{
 
         
         #line default
         #line hidden
         
-        #line 599 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 570 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\t\t\tvar unmarshaller = ");
 
         
         #line default
         #line hidden
         
-        #line 600 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 571 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineTypeUnmarshallerInstantiate()));
 
         
         #line default
         #line hidden
         
-        #line 600 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 571 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(";\r\n\t\t\t\t\t\t");
 
         
         #line default
         #line hidden
         
-        #line 601 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 572 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(unmarshalledVariable));
 
         
         #line default
         #line hidden
         
-        #line 601 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 572 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 601 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 572 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 601 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-this.Write(" = unmarshaller.Unmarshall(context);\r\n");
-
-        
-        #line default
-        #line hidden
-        
-        #line 602 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-
-				}
-
-        
-        #line default
-        #line hidden
-        
-        #line 605 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-WriteInjectXmlUnmarshallCode(member);
-        
-        #line default
-        #line hidden
-        
-        #line 605 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-this.Write("\t\t\t\t\t\tcontinue;\r\n");
+        #line 572 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+this.Write(" = unmarshaller.Unmarshall(context);\r\n\t\t\t\t\t\tcontinue;\r\n");
 
         
         #line default
         #line hidden
         
-        #line 607 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 574 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 			}
 			if (member.HasPredicateListUnmarshaller)
@@ -2620,140 +2502,117 @@ protected void ProcessResponseBodyOrStructureMembers(Member member, bool isStruc
 				var predicateData = this.Config.ServiceModel.Customizations.GetShapeModifier(member.OwningShape.Name).PredicateListUnmarshallers[member.ModeledName];
 				var predicateListUnmarshallerName = (string)predicateData["predicateListUnmarshallerName"];
 				var filterPredicateName = (string)predicateData["filterPredicateName"];
-				if (!skipXmlTestExpressionInnerLogic)
-				{
 
         
         #line default
         #line hidden
         
-        #line 616 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 581 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\t\t\tvar predicateList = ");
 
         
         #line default
         #line hidden
         
-        #line 617 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 582 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(predicateListUnmarshallerName));
 
         
         #line default
         #line hidden
         
-        #line 617 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 582 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".Instance.Unmarshall(context);\r\n\t\t\t\t\t\t");
 
         
         #line default
         #line hidden
         
-        #line 618 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 583 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(unmarshalledVariable));
 
         
         #line default
         #line hidden
         
-        #line 618 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 583 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 618 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 583 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 618 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 583 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(" = new ");
 
         
         #line default
         #line hidden
         
-        #line 618 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 583 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineType()));
 
         
         #line default
         #line hidden
         
-        #line 618 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 583 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("();\r\n\t\t\t\t\t\t");
 
         
         #line default
         #line hidden
         
-        #line 619 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 584 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(unmarshalledVariable));
 
         
         #line default
         #line hidden
         
-        #line 619 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 584 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 619 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 584 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 619 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 584 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 619 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 584 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(filterPredicateName));
 
         
         #line default
         #line hidden
         
-        #line 619 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-this.Write(" = predicateList[0];\r\n");
+        #line 584 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+this.Write(" = predicateList[0];\r\n\t\t\t\t\t\tcontinue;\r\n");
 
         
         #line default
         #line hidden
         
-        #line 620 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-
-				}
-
-        
-        #line default
-        #line hidden
-        
-        #line 623 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-WriteInjectXmlUnmarshallCode(member);
-        
-        #line default
-        #line hidden
-        
-        #line 623 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-this.Write("\t\t\t\t\t\tcontinue;\r\n");
-
-        
-        #line default
-        #line hidden
-        
-        #line 625 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 586 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 			}
 				if (!skipXmlTestExpression)
@@ -2763,64 +2622,20 @@ protected void ProcessResponseBodyOrStructureMembers(Member member, bool isStruc
         #line default
         #line hidden
         
-        #line 629 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 590 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 this.Write("\t\t\t\t\t}\r\n");
 
         
         #line default
         #line hidden
         
-        #line 631 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
+        #line 592 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
 
 				}
 		}
 	}
 
         
-        #line default
-        #line hidden
-        
-        #line 636 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-
-	protected void WriteInjectXmlUnmarshallCode(Member member)
-	{
-		if (this.Config.ServiceModel.Customizations.TryGetPropertyModifier(member.OwningShape.Name, member.ModeledName, out var modifier))
-		{
-			foreach (var code in modifier.InjectXmlUnmarshallCode)
-			{
-
-        
-        #line default
-        #line hidden
-        
-        #line 643 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-this.Write("                        ");
-
-        
-        #line default
-        #line hidden
-        
-        #line 644 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-this.Write(this.ToStringHelper.ToStringWithCulture(code));
-
-        
-        #line default
-        #line hidden
-        
-        #line 644 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-this.Write("\r\n");
-
-        
-        #line default
-        #line hidden
-        
-        #line 645 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt"
-
-			}
-		}
-	}
-
-        
         #line default
         #line hidden
     }
diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.tt b/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.tt
index 24b9745d2972..f8c36f8c2bff 100644
--- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.tt
+++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.tt
@@ -148,8 +148,6 @@ using Amazon.Runtime.Internal.Util;
 		{
 			foreach (var member in this.Operation.ResponseHeaderMembers)
 			{
-				if (this.Config.ServiceModel.Customizations.ShapeModifiers.TryGetValue(member.OwningShape.Name, out var modifier) && modifier.ExcludedUnmarshallingProperties.Contains(member.ModeledName))
-					continue;
 				if (member.Shape.IsMap)
 				{
 #>
@@ -430,13 +428,12 @@ using Amazon.Runtime.Internal.Util;
 /// Only to be used by rest-xml response unmarshallers
 	protected void ProcessResponseBodyOrStructureMembers(Member member, bool isStructure, Shape topLevelShape)
 	{
-		bool skipXmlTestExpression = false, isDataTypeSwapList = false, dataTypeSwapIsFlattened = false, skipXmlTestExpressionInnerLogic = false;
+		bool skipXmlTestExpression = false, isDataTypeSwapList = false, dataTypeSwapIsFlattened = false;
 
 		if (this.Config.ServiceModel.Customizations.ShapeModifiers.TryGetValue(topLevelShape.Name, out var modifier) && modifier.SkipXmlTestExpressionProperties.Contains(member.ModeledName))
 			skipXmlTestExpression = true;
 
-		if (this.Config.ServiceModel.Customizations.TryGetPropertyModifier(member.OwningShape.Name, member.ModeledName, out var propModifier) && propModifier.SkipContextTestExpressionUnmarshallingLogic)
-			skipXmlTestExpressionInnerLogic = true;
+
 		if (this.Config.ServiceModel.Customizations.OverrideDataType(topLevelShape.Name, member.ModeledName) != null)
 		{
 			var dataTypeOverride = this.Config.ServiceModel.Customizations.OverrideDataType(topLevelShape.Name, member.ModeledName);
@@ -458,8 +455,6 @@ using Amazon.Runtime.Internal.Util;
 					{
 <#+
 				}
-				if (!skipXmlTestExpressionInnerLogic)
-				{
 #>
                         if (<#=unmarshalledVariable#>.<#=member.PropertyName#> == null)
                         {
@@ -467,10 +462,6 @@ using Amazon.Runtime.Internal.Util;
                         }
 						var unmarshaller = <#= member.DetermineTypeUnmarshallerInstantiate() #>;
 						<#=unmarshalledVariable#>.<#=member.PropertyName#>.Add(unmarshaller.Unmarshall(context));
-<#+
-				}
-#>
-<#+WriteInjectXmlUnmarshallCode(member);#>
 						continue;
 <#+
 				if (!skipXmlTestExpression)
@@ -489,8 +480,6 @@ using Amazon.Runtime.Internal.Util;
 				    {
 <#+
 				}
-				if (!skipXmlTestExpressionInnerLogic)
-				{				
 #>
                         if (<#=unmarshalledVariable#>.<#=member.PropertyName#> == null)
                         {
@@ -498,10 +487,6 @@ using Amazon.Runtime.Internal.Util;
                         }
 					    var unmarshaller = <#= member.DetermineTypeUnmarshallerInstantiate() #>;
 					    <#=unmarshalledVariable#>.<#=member.PropertyName#>.Add(unmarshaller.Unmarshall(context));
-<#+
-				}
-#>
-<#+WriteInjectXmlUnmarshallCode(member);#>
 					    continue;
 <#+
 				if (!skipXmlTestExpression)
@@ -523,8 +508,6 @@ using Amazon.Runtime.Internal.Util;
 					{
 <#+
 				}
-				if (!skipXmlTestExpressionInnerLogic)
-				{
 #>
                         if (response.<#=member.PropertyName#> == null)
                         {
@@ -532,10 +515,6 @@ using Amazon.Runtime.Internal.Util;
                         }
 						var unmarshaller = <#= member.DetermineTypeUnmarshallerInstantiate() #>;
 						<#=unmarshalledVariable#>.<#=member.PropertyName#>.Add(unmarshaller.Unmarshall(context));
-<#+
-				}
-#>
-<#+WriteInjectXmlUnmarshallCode(member);#>
 						continue;
 <#+
 				if (!skipXmlTestExpression)
@@ -554,15 +533,9 @@ using Amazon.Runtime.Internal.Util;
 					{
 <#+
 				}
-				if (!skipXmlTestExpressionInnerLogic)
-				{
 #>
 						var unmarshaller = <#= member.DetermineTypeUnmarshallerInstantiate() #>;
 						<#=unmarshalledVariable#>.<#=member.PropertyName#> = unmarshaller.Unmarshall(context);
-<#+
-				}
-#>
-<#+WriteInjectXmlUnmarshallCode(member);#>
 						continue;
 <#+
 				if (!skipXmlTestExpression)
@@ -594,15 +567,9 @@ using Amazon.Runtime.Internal.Util;
 			}
 			if (!member.HasPredicateListUnmarshaller)
 			{
-				if (!skipXmlTestExpressionInnerLogic)
-				{
 #>
 						var unmarshaller = <#= member.DetermineTypeUnmarshallerInstantiate() #>;
 						<#=unmarshalledVariable#>.<#=member.PropertyName#> = unmarshaller.Unmarshall(context);
-<#+
-				}
-#>
-<#+WriteInjectXmlUnmarshallCode(member);#>
 						continue;
 <#+
 			}
@@ -611,16 +578,10 @@ using Amazon.Runtime.Internal.Util;
 				var predicateData = this.Config.ServiceModel.Customizations.GetShapeModifier(member.OwningShape.Name).PredicateListUnmarshallers[member.ModeledName];
 				var predicateListUnmarshallerName = (string)predicateData["predicateListUnmarshallerName"];
 				var filterPredicateName = (string)predicateData["filterPredicateName"];
-				if (!skipXmlTestExpressionInnerLogic)
-				{
 #>
 						var predicateList = <#=predicateListUnmarshallerName#>.Instance.Unmarshall(context);
 						<#=unmarshalledVariable#>.<#=member.PropertyName#> = new <#=member.DetermineType()#>();
 						<#=unmarshalledVariable#>.<#=member.PropertyName#>.<#=filterPredicateName#> = predicateList[0];
-<#+
-				}
-#>
-<#+WriteInjectXmlUnmarshallCode(member);#>
 						continue;
 <#+
 			}
@@ -632,18 +593,4 @@ using Amazon.Runtime.Internal.Util;
 				}
 		}
 	}
-#>
-<#+
-	protected void WriteInjectXmlUnmarshallCode(Member member)
-	{
-		if (this.Config.ServiceModel.Customizations.TryGetPropertyModifier(member.OwningShape.Name, member.ModeledName, out var modifier))
-		{
-			foreach (var code in modifier.InjectXmlUnmarshallCode)
-			{
-#>
-                        <#=code#>
-<#+
-			}
-		}
-	}
 #>
\ No newline at end of file
diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.cs b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.cs
index 52b4d4e684b3..8fdb34fb3ee3 100644
--- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.cs
+++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.cs
@@ -1987,7 +1987,7 @@ void ProcessStructure(int level, string variableName, Shape shape)
         #line 430 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 		
 	}
-
+// Only namespaces at the top level Shape matter for a structure, so there is no logic for namespaces here.
 	void ProcessStructure(int level, string variableName, Member member)
 	{
 			var shape = member.Shape.IsList ?  member.Shape.ListShape : member.Shape ;
@@ -2045,201 +2045,77 @@ void ProcessStructure(int level, string variableName, Member member)
         #line hidden
         
         #line 445 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-
-			if (!string.IsNullOrEmpty(member.Shape.XmlNamespace))
-			{
-				if (!string.IsNullOrEmpty(member.Shape.XmlNamespacePrefix))
-				{
-
-        
-        #line default
-        #line hidden
-        
-        #line 451 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 451 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\"");
-
-        
-        #line default
-        #line hidden
-        
-        #line 451 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.XmlNamespacePrefix));
-
-        
-        #line default
-        #line hidden
-        
-        #line 451 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-this.Write("\",\"");
-
-        
-        #line default
-        #line hidden
-        
-        #line 451 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-this.Write(this.ToStringHelper.ToStringWithCulture(marshallName));
-
-        
-        #line default
-        #line hidden
-        
-        #line 451 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-this.Write("\",\"");
-
-        
-        #line default
-        #line hidden
-        
-        #line 451 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.XmlNamespace));
-
-        
-        #line default
-        #line hidden
-        
-        #line 451 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-this.Write("\");\r\n");
-
-        
-        #line default
-        #line hidden
-        
-        #line 452 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-
-				}
-				else
-				{
-
-        
-        #line default
-        #line hidden
-        
-        #line 457 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
-
-        
-        #line default
-        #line hidden
-        
-        #line 457 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 445 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\"");
 
         
         #line default
         #line hidden
         
-        #line 457 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 445 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(marshallName));
 
         
         #line default
         #line hidden
         
-        #line 457 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-this.Write("\",\"");
-
-        
-        #line default
-        #line hidden
-        
-        #line 457 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.XmlNamespace));
-
-        
-        #line default
-        #line hidden
-        
-        #line 457 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 445 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 458 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-
-				}
-			}
-			else
-			{
-
-        
-        #line default
-        #line hidden
-        
-        #line 464 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
+        #line 446 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
-        
-        #line default
-        #line hidden
-        
-        #line 464 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\"");
 
         
         #line default
         #line hidden
         
-        #line 464 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-this.Write(this.ToStringHelper.ToStringWithCulture(marshallName));
-
-        
-        #line default
-        #line hidden
-        
-        #line 464 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-this.Write("\");\r\n");
+        #line 448 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
-        
-        #line default
-        #line hidden
-        
-        #line 465 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-
-			}
 			ProcessMembers(level + 1, variableName, shape.Members);
 
         
         #line default
         #line hidden
         
-        #line 469 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 451 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 469 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 451 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\txmlWriter.WriteEndElement();\r\n");
 
         
         #line default
         #line hidden
         
-        #line 470 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 452 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 470 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 452 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t}\r\n");
 
         
         #line default
         #line hidden
         
-        #line 471 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 453 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 		
 	}
 	void ProcessList(int level, string variableName, Member member)
@@ -2251,119 +2127,119 @@ void ProcessList(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 478 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 460 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 478 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 460 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\tvar ");
 
         
         #line default
         #line hidden
         
-        #line 478 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 460 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(listVariable));
 
         
         #line default
         #line hidden
         
-        #line 478 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 460 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(" = ");
 
         
         #line default
         #line hidden
         
-        #line 478 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 460 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(variableName));
 
         
         #line default
         #line hidden
         
-        #line 478 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 460 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 478 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 460 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 478 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 460 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(";\r\n");
 
         
         #line default
         #line hidden
         
-        #line 479 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 461 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 479 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 461 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\tif (");
 
         
         #line default
         #line hidden
         
-        #line 479 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 461 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(listVariable));
 
         
         #line default
         #line hidden
         
-        #line 479 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 461 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(" != null && (");
 
         
         #line default
         #line hidden
         
-        #line 479 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 461 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(listVariable));
 
         
         #line default
         #line hidden
         
-        #line 479 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 461 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(".Count > 0 || !AWSConfigs.InitializeCollections)) \r\n");
 
         
         #line default
         #line hidden
         
-        #line 480 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 462 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 480 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 462 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t{\r\n");
 
         
         #line default
         #line hidden
         
-        #line 481 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 463 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 				if (!member.IsFlattened && !member.Shape.IsFlattened)
 				{
@@ -2374,35 +2250,35 @@ void ProcessList(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 487 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 469 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 487 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 469 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\"");
 
         
         #line default
         #line hidden
         
-        #line 487 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 469 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName));
 
         
         #line default
         #line hidden
         
-        #line 487 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 469 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 488 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 470 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 					}
 					else
@@ -2414,49 +2290,49 @@ void ProcessList(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 495 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 477 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 495 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 477 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\"");
 
         
         #line default
         #line hidden
         
-        #line 495 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 477 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName));
 
         
         #line default
         #line hidden
         
-        #line 495 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 477 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\", \"");
 
         
         #line default
         #line hidden
         
-        #line 495 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 477 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.XmlNamespace));
 
         
         #line default
         #line hidden
         
-        #line 495 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 477 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 496 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 478 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 						}
 						else
@@ -2466,77 +2342,77 @@ void ProcessList(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 501 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 483 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 501 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 483 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\"");
 
         
         #line default
         #line hidden
         
-        #line 501 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 483 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName));
 
         
         #line default
         #line hidden
         
-        #line 501 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 483 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 502 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 484 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 502 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 484 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\txmlWriter.WriteAttributeString(\"xmlns\",\"");
 
         
         #line default
         #line hidden
         
-        #line 502 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 484 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.XmlNamespacePrefix));
 
         
         #line default
         #line hidden
         
-        #line 502 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 484 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\",null,\"");
 
         
         #line default
         #line hidden
         
-        #line 502 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 484 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.XmlNamespace));
 
         
         #line default
         #line hidden
         
-        #line 502 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 484 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 503 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 485 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 						}
 					}
@@ -2546,63 +2422,63 @@ void ProcessList(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 508 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 490 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 508 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 490 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\tforeach (var ");
 
         
         #line default
         #line hidden
         
-        #line 508 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 490 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(listItemVariable));
 
         
         #line default
         #line hidden
         
-        #line 508 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 490 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(" in ");
 
         
         #line default
         #line hidden
         
-        #line 508 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 490 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(listVariable));
 
         
         #line default
         #line hidden
         
-        #line 508 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 490 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(") \r\n");
 
         
         #line default
         #line hidden
         
-        #line 509 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 491 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 509 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 491 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t{\r\n");
 
         
         #line default
         #line hidden
         
-        #line 510 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 492 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 			
 			if(member.Shape.ListShape.IsStructure)
 			{
@@ -2620,7 +2496,7 @@ void ProcessList(int level, string variableName, Member member)
 				else
 					listMarshallName = member.Shape.ListMarshallName ?? "member";
 				// see https://smithy.io/2.0/spec/protocol-traits.html#xmlflattened-trait
-				if(member.IsFlattened || member.Shape.IsFlattened)
+				if(member.IsFlattened)
 					listMarshallName = member.LocationName ?? member.ModeledName;
 				if(member.Shape.ListShape.IsTimeStamp)
 				{
@@ -2630,91 +2506,91 @@ void ProcessList(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 533 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 515 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 533 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 515 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\"");
 
         
         #line default
         #line hidden
         
-        #line 533 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 515 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(listMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 533 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 515 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 516 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 516 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteValue(");
 
         
         #line default
         #line hidden
         
-        #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 516 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ListShape.PrimitiveMarshaller(MarshallLocation.Body)));
 
         
         #line default
         #line hidden
         
-        #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 516 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("(");
 
         
         #line default
         #line hidden
         
-        #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 516 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(listItemVariable));
 
         
         #line default
         #line hidden
         
-        #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 516 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("));\r\n");
 
         
         #line default
         #line hidden
         
-        #line 535 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 517 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 535 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 517 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n");
 
         
         #line default
         #line hidden
         
-        #line 536 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 518 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 				
 
 				}
@@ -2734,35 +2610,35 @@ void ProcessList(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 551 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 533 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 551 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 533 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\"");
 
         
         #line default
         #line hidden
         
-        #line 551 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 533 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(listMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 551 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 533 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 552 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 					}
 					else
@@ -2776,49 +2652,49 @@ void ProcessList(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 561 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 543 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 561 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 543 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\"");
 
         
         #line default
         #line hidden
         
-        #line 561 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 543 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(listMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 561 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 543 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\", \"");
 
         
         #line default
         #line hidden
         
-        #line 561 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 543 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(listMemberXmlNamespaceNode));
 
         
         #line default
         #line hidden
         
-        #line 561 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 543 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n\r\n");
 
         
         #line default
         #line hidden
         
-        #line 563 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 545 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 						}
 						else
@@ -2828,77 +2704,77 @@ void ProcessList(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 568 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 550 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 568 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 550 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\"");
 
         
         #line default
         #line hidden
         
-        #line 568 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 550 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(listMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 568 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 550 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 569 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 551 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 569 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 551 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteAttributeString(\"xmlns\",\"");
 
         
         #line default
         #line hidden
         
-        #line 569 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 551 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(listMemberXmlNamespaceNode[ServiceModel.XmlNamespacePrefixKey]));
 
         
         #line default
         #line hidden
         
-        #line 569 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 551 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\",null,\"");
 
         
         #line default
         #line hidden
         
-        #line 569 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 551 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(listMemberXmlNamespaceNode[ServiceModel.XmlNamespaceUriKey]));
 
         
         #line default
         #line hidden
         
-        #line 569 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 551 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 570 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 552 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 						}
 					}
@@ -2911,7 +2787,7 @@ void ProcessList(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 578 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 560 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 					if (innerShape == null || (innerShape != null && !innerShape.Shape.IsList))
 					{
@@ -2920,35 +2796,35 @@ void ProcessList(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 582 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 564 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 582 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 564 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteValue(");
 
         
         #line default
         #line hidden
         
-        #line 582 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 564 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(listItemVariable));
 
         
         #line default
         #line hidden
         
-        #line 582 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 564 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 583 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 565 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 					}
 
@@ -2956,21 +2832,21 @@ void ProcessList(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 586 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 568 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 586 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 568 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n");
 
         
         #line default
         #line hidden
         
-        #line 587 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 569 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 				
 				}
 			}			
@@ -2979,21 +2855,21 @@ void ProcessList(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 591 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 573 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 591 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 573 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t}\t\t\t\r\n");
 
         
         #line default
         #line hidden
         
-        #line 592 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 574 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 			if (!member.IsFlattened && !member.Shape.IsFlattened)
 			{
@@ -3002,21 +2878,21 @@ void ProcessList(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 596 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 578 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 596 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 578 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\txmlWriter.WriteEndElement();\t\t\t\r\n");
 
         
         #line default
         #line hidden
         
-        #line 597 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 579 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 			}
 
@@ -3024,21 +2900,21 @@ void ProcessList(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 600 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 582 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 600 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 582 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t}\r\n");
 
         
         #line default
         #line hidden
         
-        #line 601 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 583 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 				
 	}
 
@@ -3051,35 +2927,35 @@ void ProcessMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 609 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 591 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 609 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 591 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\"");
 
         
         #line default
         #line hidden
         
-        #line 609 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 591 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName));
 
         
         #line default
         #line hidden
         
-        #line 609 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 591 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 610 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 592 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 		}
 		else
@@ -3091,49 +2967,49 @@ void ProcessMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 617 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 599 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 617 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 599 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\"");
 
         
         #line default
         #line hidden
         
-        #line 617 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 599 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName));
 
         
         #line default
         #line hidden
         
-        #line 617 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 599 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\",\"");
 
         
         #line default
         #line hidden
         
-        #line 617 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 599 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.XmlNamespace));
 
         
         #line default
         #line hidden
         
-        #line 617 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 599 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n\r\n");
 
         
         #line default
         #line hidden
         
-        #line 619 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 601 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 			}
 			else
@@ -3143,77 +3019,77 @@ void ProcessMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 624 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 606 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 624 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 606 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\"");
 
         
         #line default
         #line hidden
         
-        #line 624 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 606 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName));
 
         
         #line default
         #line hidden
         
-        #line 624 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 606 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 625 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 607 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 625 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 607 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\txmlWriter.WriteAttributeString(\"xmlns\",\"");
 
         
         #line default
         #line hidden
         
-        #line 625 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 607 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.XmlNamespacePrefix));
 
         
         #line default
         #line hidden
         
-        #line 625 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 607 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\",null,\"");
 
         
         #line default
         #line hidden
         
-        #line 625 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 607 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.XmlNamespace));
 
         
         #line default
         #line hidden
         
-        #line 625 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 607 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 626 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 608 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 			}
 		}
@@ -3222,77 +3098,77 @@ void ProcessMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 630 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 612 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 630 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 612 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\tforeach (var kvp in ");
 
         
         #line default
         #line hidden
         
-        #line 630 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 612 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(variableName));
 
         
         #line default
         #line hidden
         
-        #line 630 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 612 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 630 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 612 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 630 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 612 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(")\r\n");
 
         
         #line default
         #line hidden
         
-        #line 631 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 613 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 631 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 613 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t{\r\n");
 
         
         #line default
         #line hidden
         
-        #line 632 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 614 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 632 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 614 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\"entry\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 633 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 615 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 		if(string.IsNullOrEmpty(member.Shape.KeyShapeXmlNamespace))
 		{
@@ -3301,42 +3177,42 @@ void ProcessMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 636 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 618 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\r\n");
 
         
         #line default
         #line hidden
         
-        #line 638 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 620 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 638 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 620 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\"");
 
         
         #line default
         #line hidden
         
-        #line 638 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 620 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.KeyMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 638 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 620 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\", kvp.Key);\r\n");
 
         
         #line default
         #line hidden
         
-        #line 639 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 621 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 		}
 		else
@@ -3349,49 +3225,49 @@ void ProcessMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 647 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 629 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 647 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 629 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\"");
 
         
         #line default
         #line hidden
         
-        #line 647 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 629 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.KeyMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 647 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 629 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\",\"");
 
         
         #line default
         #line hidden
         
-        #line 647 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 629 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.KeyShapeXmlNamespace));
 
         
         #line default
         #line hidden
         
-        #line 647 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 629 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\",kvp.Key);\r\n");
 
         
         #line default
         #line hidden
         
-        #line 648 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 630 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 			}
 			else
@@ -3401,63 +3277,63 @@ void ProcessMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 653 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 635 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 653 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 635 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\"");
 
         
         #line default
         #line hidden
         
-        #line 653 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 635 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(keyNode[ServiceModel.XmlNamespaceKey][ServiceModel.XmlNamespacePrefixKey]));
 
         
         #line default
         #line hidden
         
-        #line 653 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 635 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\",\"");
 
         
         #line default
         #line hidden
         
-        #line 653 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 635 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.KeyMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 653 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 635 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\",\"");
 
         
         #line default
         #line hidden
         
-        #line 653 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 635 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.KeyShapeXmlNamespace));
 
         
         #line default
         #line hidden
         
-        #line 653 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 635 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\",kvp.Key);\r\n\r\n");
 
         
         #line default
         #line hidden
         
-        #line 655 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 637 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 			}
 		}
@@ -3472,35 +3348,35 @@ void ProcessMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 665 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 647 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 665 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 647 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\"");
 
         
         #line default
         #line hidden
         
-        #line 665 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 647 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 665 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 647 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 666 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 648 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 			ProcessStructureAsMapValue(level + 2, "kvp.Value", member.Shape.ValueShape);
 
@@ -3508,21 +3384,21 @@ void ProcessMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 669 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 651 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 669 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 651 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n");
 
         
         #line default
         #line hidden
         
-        #line 670 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 652 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 		}
 		else
@@ -3534,49 +3410,49 @@ void ProcessMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 677 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 659 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 677 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 659 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\"");
 
         
         #line default
         #line hidden
         
-        #line 677 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 659 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 677 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 659 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\", kvp.Value");
 
         
         #line default
         #line hidden
         
-        #line 677 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 659 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShape.IsString ? "" : ".ToString()"));
 
         
         #line default
         #line hidden
         
-        #line 677 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 659 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 678 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 660 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 			}
 			else
@@ -3589,63 +3465,63 @@ void ProcessMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 686 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 668 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 686 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 668 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\"");
 
         
         #line default
         #line hidden
         
-        #line 686 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 668 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 686 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 668 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\", \"");
 
         
         #line default
         #line hidden
         
-        #line 686 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 668 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShapeXmlNamespace));
 
         
         #line default
         #line hidden
         
-        #line 686 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 668 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\",kvp.Value");
 
         
         #line default
         #line hidden
         
-        #line 686 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 668 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShape.IsString ? "" : ".ToString()"));
 
         
         #line default
         #line hidden
         
-        #line 686 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 668 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 687 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 669 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 				}
 				else
 				{
@@ -3654,77 +3530,77 @@ void ProcessMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 691 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 673 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 691 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 673 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\"");
 
         
         #line default
         #line hidden
         
-        #line 691 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 673 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(valueNode[ServiceModel.XmlNamespaceKey][ServiceModel.XmlNamespacePrefixKey]));
 
         
         #line default
         #line hidden
         
-        #line 691 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 673 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\",\"");
 
         
         #line default
         #line hidden
         
-        #line 691 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 673 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 691 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 673 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\", \"");
 
         
         #line default
         #line hidden
         
-        #line 691 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 673 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShapeXmlNamespace));
 
         
         #line default
         #line hidden
         
-        #line 691 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 673 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\",kvp.Value");
 
         
         #line default
         #line hidden
         
-        #line 691 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 673 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShape.IsString ? "" : ".ToString()"));
 
         
         #line default
         #line hidden
         
-        #line 691 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 673 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 692 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 674 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 				}
 			}
@@ -3734,49 +3610,49 @@ void ProcessMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 697 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 679 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 697 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 679 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n");
 
         
         #line default
         #line hidden
         
-        #line 698 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 680 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 698 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 680 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t}\r\n");
 
         
         #line default
         #line hidden
         
-        #line 699 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 681 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 699 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 681 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\txmlWriter.WriteEndElement();\r\n");
 
         
         #line default
         #line hidden
         
-        #line 700 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 682 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 		
 	}
 
@@ -3784,7 +3660,7 @@ void ProcessMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 703 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 685 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 	// Separating the processing of a flattened map and a regular map for maintability
 	void ProcessFlattenedMap(int level, string variableName, Member member)
@@ -3794,91 +3670,91 @@ void ProcessFlattenedMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 708 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 690 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 708 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 690 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\tforeach (var kvp in ");
 
         
         #line default
         #line hidden
         
-        #line 708 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 690 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(variableName));
 
         
         #line default
         #line hidden
         
-        #line 708 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 690 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 708 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 690 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 708 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 690 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(")\r\n");
 
         
         #line default
         #line hidden
         
-        #line 709 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 691 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 709 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 691 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t{\r\n");
 
         
         #line default
         #line hidden
         
-        #line 710 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 692 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 710 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 692 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\"");
 
         
         #line default
         #line hidden
         
-        #line 710 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 692 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName));
 
         
         #line default
         #line hidden
         
-        #line 710 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 692 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 711 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 693 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 		if(string.IsNullOrEmpty(member.Shape.KeyShapeXmlNamespace))
 		{
@@ -3887,35 +3763,35 @@ void ProcessFlattenedMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 715 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 697 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 715 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 697 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\"");
 
         
         #line default
         #line hidden
         
-        #line 715 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 697 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.KeyMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 715 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 697 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\", kvp.Key);\r\n");
 
         
         #line default
         #line hidden
         
-        #line 716 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 698 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 		}
 		else
@@ -3925,49 +3801,49 @@ void ProcessFlattenedMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 721 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 703 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 721 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 703 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\"");
 
         
         #line default
         #line hidden
         
-        #line 721 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 703 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.KeyMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 721 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 703 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\",\"");
 
         
         #line default
         #line hidden
         
-        #line 721 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 703 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.KeyShapeXmlNamespace));
 
         
         #line default
         #line hidden
         
-        #line 721 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 703 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\", kvp.Key);\r\n");
 
         
         #line default
         #line hidden
         
-        #line 722 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 704 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 		}
 		if(member.Shape.ValueShape.IsMap)
@@ -3981,35 +3857,35 @@ void ProcessFlattenedMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 731 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 713 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 731 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 713 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\"");
 
         
         #line default
         #line hidden
         
-        #line 731 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 713 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 731 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 713 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 732 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 714 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 			ProcessStructureAsMapValue(level + 2, "kvp.Value", member.Shape.ValueShape);
 
@@ -4017,21 +3893,21 @@ void ProcessFlattenedMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 735 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 717 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 735 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 717 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n");
 
         
         #line default
         #line hidden
         
-        #line 736 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 718 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 		}
 		else
@@ -4043,63 +3919,63 @@ void ProcessFlattenedMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 743 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 725 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 743 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 725 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\"");
 
         
         #line default
         #line hidden
         
-        #line 743 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 725 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 743 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 725 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\", kvp.Value");
 
         
         #line default
         #line hidden
         
-        #line 743 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 725 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShape.IsString ? "" : ".ToString()"));
 
         
         #line default
         #line hidden
         
-        #line 743 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 725 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 744 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 726 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 744 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 726 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n");
 
         
         #line default
         #line hidden
         
-        #line 745 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 727 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 			}
 			else
@@ -4109,77 +3985,77 @@ void ProcessFlattenedMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 750 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 732 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 750 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 732 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\"");
 
         
         #line default
         #line hidden
         
-        #line 750 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 732 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 750 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 732 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\", \"");
 
         
         #line default
         #line hidden
         
-        #line 750 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 732 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShapeXmlNamespace));
 
         
         #line default
         #line hidden
         
-        #line 750 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 732 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\", kvp.Value");
 
         
         #line default
         #line hidden
         
-        #line 750 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 732 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShape.IsString ? "" : ".ToString()"));
 
         
         #line default
         #line hidden
         
-        #line 750 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 732 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 751 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 733 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 751 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 733 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n");
 
         
         #line default
         #line hidden
         
-        #line 752 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 734 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 			}
 		}
@@ -4188,21 +4064,21 @@ void ProcessFlattenedMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 756 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 738 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 756 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 738 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t}\t\r\n");
 
         
         #line default
         #line hidden
         
-        #line 757 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 739 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 	}
 
@@ -4210,7 +4086,7 @@ void ProcessFlattenedMap(int level, string variableName, Member member)
         #line default
         #line hidden
         
-        #line 760 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 742 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 	void ProcessSubMap(int level, Shape shape, string parentVariableName)
 	{				
@@ -4219,133 +4095,133 @@ void ProcessSubMap(int level, Shape shape, string parentVariableName)
         #line default
         #line hidden
         
-        #line 764 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 746 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 764 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 746 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\"value\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 765 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 747 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 765 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 747 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\tforeach (var kvp");
 
         
         #line default
         #line hidden
         
-        #line 765 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 747 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(level));
 
         
         #line default
         #line hidden
         
-        #line 765 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 747 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(" in ");
 
         
         #line default
         #line hidden
         
-        #line 765 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 747 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(parentVariableName));
 
         
         #line default
         #line hidden
         
-        #line 765 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 747 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(".Value) \r\n");
 
         
         #line default
         #line hidden
         
-        #line 766 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 748 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 766 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 748 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t{\r\n");
 
         
         #line default
         #line hidden
         
-        #line 767 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 749 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 767 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 749 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\"entry\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 768 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 750 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 768 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 750 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\"");
 
         
         #line default
         #line hidden
         
-        #line 768 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 750 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(shape.KeyMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 768 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 750 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\", kvp");
 
         
         #line default
         #line hidden
         
-        #line 768 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 750 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(level));
 
         
         #line default
         #line hidden
         
-        #line 768 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 750 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(".Key);\r\n");
 
         
         #line default
         #line hidden
         
-        #line 769 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 751 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 		if(shape.ValueShape.IsMap)
 		{
@@ -4358,49 +4234,49 @@ void ProcessSubMap(int level, Shape shape, string parentVariableName)
         #line default
         #line hidden
         
-        #line 777 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 759 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 777 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 759 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\"");
 
         
         #line default
         #line hidden
         
-        #line 777 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 759 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(shape.ValueMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 777 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 759 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\", kvp");
 
         
         #line default
         #line hidden
         
-        #line 777 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 759 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(level));
 
         
         #line default
         #line hidden
         
-        #line 777 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 759 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(".Value);\r\n");
 
         
         #line default
         #line hidden
         
-        #line 778 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 760 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 		}
 
@@ -4408,49 +4284,49 @@ void ProcessSubMap(int level, Shape shape, string parentVariableName)
         #line default
         #line hidden
         
-        #line 781 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 763 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 781 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 763 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n");
 
         
         #line default
         #line hidden
         
-        #line 782 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 764 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 782 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 764 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t}\t\t\t\r\n");
 
         
         #line default
         #line hidden
         
-        #line 783 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 765 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 783 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 765 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\txmlWriter.WriteEndElement();\t\t\t\t\r\n");
 
         
         #line default
         #line hidden
         
-        #line 784 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 766 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 				
 	}
 
@@ -4458,7 +4334,7 @@ void ProcessSubMap(int level, Shape shape, string parentVariableName)
         #line default
         #line hidden
         
-        #line 787 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 769 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 	protected void ProcessNonStructurePayload(Member payload, int level)
 	{
@@ -4469,63 +4345,63 @@ protected void ProcessNonStructurePayload(Member payload, int level)
         #line default
         #line hidden
         
-        #line 793 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 775 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 793 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 775 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("request.Content = Encoding.UTF8.GetBytes(");
 
         
         #line default
         #line hidden
         
-        #line 793 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 775 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.RequestPayloadMember.PrimitiveMarshaller));
 
         
         #line default
         #line hidden
         
-        #line 793 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 775 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("(publicRequest.");
 
         
         #line default
         #line hidden
         
-        #line 793 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 775 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.RequestPayloadMember.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 793 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 775 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("));\r\n");
 
         
         #line default
         #line hidden
         
-        #line 794 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 776 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 794 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 776 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("request.Headers[\"Content-Type\"] = \"text/plain\";\r\n");
 
         
         #line default
         #line hidden
         
-        #line 795 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 777 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 		}
 		else if(payload.Shape.IsMemoryStream)
@@ -4535,49 +4411,49 @@ protected void ProcessNonStructurePayload(Member payload, int level)
         #line default
         #line hidden
         
-        #line 800 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 782 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 800 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 782 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("request.ContentStream = publicRequest.");
 
         
         #line default
         #line hidden
         
-        #line 800 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 782 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.RequestPayloadMember.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 800 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 782 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(";\r\n");
 
         
         #line default
         #line hidden
         
-        #line 801 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 783 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 801 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 783 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("request.Headers[\"Content-Type\"] = \"application/octet-stream\";\r\n");
 
         
         #line default
         #line hidden
         
-        #line 802 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 784 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 		}
 	}
@@ -4586,7 +4462,7 @@ protected void ProcessNonStructurePayload(Member payload, int level)
         #line default
         #line hidden
         
-        #line 806 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 788 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 	protected void ProcessStructureAsMapValue(int level, string variableName, Shape shape)
 	{
@@ -4596,49 +4472,49 @@ protected void ProcessStructureAsMapValue(int level, string variableName, Shape
         #line default
         #line hidden
         
-        #line 811 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 793 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 811 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 793 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\tif (");
 
         
         #line default
         #line hidden
         
-        #line 811 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 793 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(variableName));
 
         
         #line default
         #line hidden
         
-        #line 811 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 793 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(" != null) \r\n");
 
         
         #line default
         #line hidden
         
-        #line 812 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 794 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 812 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 794 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t{\r\n");
 
         
         #line default
         #line hidden
         
-        #line 813 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 795 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 			ProcessMembers(level + 1, variableName, shape.Members, insideMap: true);
 
@@ -4646,21 +4522,21 @@ protected void ProcessStructureAsMapValue(int level, string variableName, Shape
         #line default
         #line hidden
         
-        #line 816 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 798 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 816 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 798 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t}\r\n");
 
         
         #line default
         #line hidden
         
-        #line 817 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 799 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 	}
 
@@ -4668,7 +4544,7 @@ protected void ProcessStructureAsMapValue(int level, string variableName, Shape
         #line default
         #line hidden
         
-        #line 820 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 802 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 	protected void ProcessNestedList(int level, string variableName, Member innerMember, Member owningMember)
 	{
@@ -4688,133 +4564,133 @@ protected void ProcessNestedList(int level, string variableName, Member innerMem
         #line default
         #line hidden
         
-        #line 835 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 817 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level) * 4)));
 
         
         #line default
         #line hidden
         
-        #line 835 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 817 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\tforeach (var ");
 
         
         #line default
         #line hidden
         
-        #line 835 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 817 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(innerListItemVariable));
 
         
         #line default
         #line hidden
         
-        #line 835 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 817 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(" in ");
 
         
         #line default
         #line hidden
         
-        #line 835 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 817 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(listItemVariable));
 
         
         #line default
         #line hidden
         
-        #line 835 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 817 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(")\r\n");
 
         
         #line default
         #line hidden
         
-        #line 836 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 818 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level) * 4)));
 
         
         #line default
         #line hidden
         
-        #line 836 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 818 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t{\r\n");
 
         
         #line default
         #line hidden
         
-        #line 837 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 819 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level) * 4)));
 
         
         #line default
         #line hidden
         
-        #line 837 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 819 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\"");
 
         
         #line default
         #line hidden
         
-        #line 837 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 819 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(listMarshallName));
 
         
         #line default
         #line hidden
         
-        #line 837 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 819 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 838 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 820 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level) * 4)));
 
         
         #line default
         #line hidden
         
-        #line 838 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 820 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteValue(");
 
         
         #line default
         #line hidden
         
-        #line 838 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 820 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(innerListItemVariable));
 
         
         #line default
         #line hidden
         
-        #line 838 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 820 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 839 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 821 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level) * 4)));
 
         
         #line default
         #line hidden
         
-        #line 839 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 821 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n");
 
         
         #line default
         #line hidden
         
-        #line 840 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 822 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 		if (innerShape != null && innerShape.Shape.IsList)
 		{
@@ -4825,21 +4701,21 @@ protected void ProcessNestedList(int level, string variableName, Member innerMem
         #line default
         #line hidden
         
-        #line 846 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 828 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level) * 4)));
 
         
         #line default
         #line hidden
         
-        #line 846 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 828 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t}\r\n");
 
         
         #line default
         #line hidden
         
-        #line 847 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 829 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 	}
 
@@ -4847,7 +4723,7 @@ protected void ProcessNestedList(int level, string variableName, Member innerMem
         #line default
         #line hidden
         
-        #line 850 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 832 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 	// xsi is a common prefix in attributes, but it cannot be included in the local name itself as the xmlWriter class will throw an exception. 
 	// Some services may model the xmlName, with the xsi prefix included like it is here https://github.com/smithy-lang/smithy/blob/7813acbfee4e90b589996ffcfa02fbe73785f654/smithy-aws-protocol-tests/model/restXmlWithNamespace/main.smithy#L147
@@ -4856,11 +4732,7 @@ protected void WriteXmlAttributeString(int level, Member member, string variable
 	{
 		var prefix = "";
 		var localName = "";
-		string ns = string.IsNullOrEmpty(member.XmlNamespace) ? member.Shape.XmlNamespace : member.XmlNamespace;
-		// in the rare case like "Type" on "Grantee" in s3, the member or the member's shape doesn't have an xmlNamespace attached
-		// but instead it uses the xmlNamespace on the owning shape. If ns is still null at this point, we use the owning shape's xml namespace
-		if (string.IsNullOrEmpty(ns))
-			ns = member.OwningShape.XmlNamespace;
+		string ns = member.XmlNamespace;
 		if (member.MarshallName.Contains(":"))
 		{
 			var colonIndex = member.MarshallName.IndexOf(":");
@@ -4877,7 +4749,7 @@ protected void WriteXmlAttributeString(int level, Member member, string variable
         #line default
         #line hidden
         
-        #line 875 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 853 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 		if(isPayload)
 		{
@@ -4886,119 +4758,119 @@ protected void WriteXmlAttributeString(int level, Member member, string variable
         #line default
         #line hidden
         
-        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 857 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 857 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\txmlWriter.WriteAttributeString(\"");
 
         
         #line default
         #line hidden
         
-        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 857 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(prefix));
 
         
         #line default
         #line hidden
         
-        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 857 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\",\"");
 
         
         #line default
         #line hidden
         
-        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 857 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(localName));
 
         
         #line default
         #line hidden
         
-        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 857 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\",\"");
 
         
         #line default
         #line hidden
         
-        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-this.Write(this.ToStringHelper.ToStringWithCulture(ns));
+        #line 857 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+this.Write(this.ToStringHelper.ToStringWithCulture(member.XmlNamespace));
 
         
         #line default
         #line hidden
         
-        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 857 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\",");
 
         
         #line default
         #line hidden
         
-        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 857 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PrimitiveMarshaller));
 
         
         #line default
         #line hidden
         
-        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 857 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("(");
 
         
         #line default
         #line hidden
         
-        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 857 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(variableName));
 
         
         #line default
         #line hidden
         
-        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 857 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 857 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(operation.RequestPayloadMember.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 857 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 857 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 857 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("));\r\n");
 
         
         #line default
         #line hidden
         
-        #line 880 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 858 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 		}
 		else
@@ -5008,105 +4880,105 @@ protected void WriteXmlAttributeString(int level, Member member, string variable
         #line default
         #line hidden
         
-        #line 885 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 863 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 885 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 863 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\txmlWriter.WriteAttributeString(\"");
 
         
         #line default
         #line hidden
         
-        #line 885 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 863 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(prefix));
 
         
         #line default
         #line hidden
         
-        #line 885 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 863 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\",\"");
 
         
         #line default
         #line hidden
         
-        #line 885 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 863 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(localName));
 
         
         #line default
         #line hidden
         
-        #line 885 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 863 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\", \"");
 
         
         #line default
         #line hidden
         
-        #line 885 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
-this.Write(this.ToStringHelper.ToStringWithCulture(ns));
+        #line 863 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+this.Write(this.ToStringHelper.ToStringWithCulture(member.XmlNamespace));
 
         
         #line default
         #line hidden
         
-        #line 885 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 863 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\",");
 
         
         #line default
         #line hidden
         
-        #line 885 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 863 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PrimitiveMarshaller));
 
         
         #line default
         #line hidden
         
-        #line 885 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 863 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("(");
 
         
         #line default
         #line hidden
         
-        #line 885 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 863 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(variableName));
 
         
         #line default
         #line hidden
         
-        #line 885 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 863 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 885 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 863 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
 
         
         #line default
         #line hidden
         
-        #line 885 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 863 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("));\r\n");
 
         
         #line default
         #line hidden
         
-        #line 886 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 864 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 		}
 	}
@@ -5115,7 +4987,7 @@ protected void WriteXmlAttributeString(int level, Member member, string variable
         #line default
         #line hidden
         
-        #line 890 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 868 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 	protected void WriteVisitorPattern(int level, string variableName, Member member)
 	{
@@ -5126,301 +4998,301 @@ protected void WriteVisitorPattern(int level, string variableName, Member member
         #line default
         #line hidden
         
-        #line 896 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 874 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 896 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 874 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\tif (");
 
         
         #line default
         #line hidden
         
-        #line 896 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 874 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(variableName));
 
         
         #line default
         #line hidden
         
-        #line 896 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 874 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 896 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 874 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.ModeledName));
 
         
         #line default
         #line hidden
         
-        #line 896 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 874 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(" != null)\r\n");
 
         
         #line default
         #line hidden
         
-        #line 897 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 875 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 897 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 875 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t{\r\n");
 
         
         #line default
         #line hidden
         
-        #line 898 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 876 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 898 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 876 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\tif (");
 
         
         #line default
         #line hidden
         
-        #line 898 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 876 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(variableName));
 
         
         #line default
         #line hidden
         
-        #line 898 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 876 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 898 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 876 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.ModeledName));
 
         
         #line default
         #line hidden
         
-        #line 898 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 876 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 898 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 876 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(visitorPattern.PredicateName));
 
         
         #line default
         #line hidden
         
-        #line 898 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 876 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(" != null)\r\n");
 
         
         #line default
         #line hidden
         
-        #line 899 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 877 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 899 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 877 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t{\r\n");
 
         
         #line default
         #line hidden
         
-        #line 900 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 878 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 900 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 878 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\"");
 
         
         #line default
         #line hidden
         
-        #line 900 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 878 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName));
 
         
         #line default
         #line hidden
         
-        #line 900 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 878 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\");\r\n");
 
         
         #line default
         #line hidden
         
-        #line 901 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 901 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\t");
 
         
         #line default
         #line hidden
         
-        #line 901 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(variableName));
 
         
         #line default
         #line hidden
         
-        #line 901 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 901 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(member.ModeledName));
 
         
         #line default
         #line hidden
         
-        #line 901 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(".");
 
         
         #line default
         #line hidden
         
-        #line 901 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(visitorPattern.PredicateName));
 
         
         #line default
         #line hidden
         
-        #line 901 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(".Accept(new ");
 
         
         #line default
         #line hidden
         
-        #line 901 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(visitorPattern.VisitorName));
 
         
         #line default
         #line hidden
         
-        #line 901 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("(");
 
         
         #line default
         #line hidden
         
-        #line 901 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(visitorPattern.VisitorParam));
 
         
         #line default
         #line hidden
         
-        #line 901 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 879 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("));\r\n");
 
         
         #line default
         #line hidden
         
-        #line 902 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 880 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 902 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 880 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n");
 
         
         #line default
         #line hidden
         
-        #line 903 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 881 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 903 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 881 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t}\r\n");
 
         
         #line default
         #line hidden
         
-        #line 904 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 882 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 904 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 882 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\telse\r\n");
 
         
         #line default
         #line hidden
         
-        #line 905 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 883 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 905 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 883 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t{\r\n");
 
         
         #line default
         #line hidden
         
-        #line 906 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 884 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 												ProcessStructure(level+=2, variableName, member);
 
@@ -5428,35 +5300,35 @@ protected void WriteVisitorPattern(int level, string variableName, Member member
         #line default
         #line hidden
         
-        #line 909 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 887 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ' , level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 909 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 887 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t\t}\r\n\r\n");
 
         
         #line default
         #line hidden
         
-        #line 911 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 889 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4)));
 
         
         #line default
         #line hidden
         
-        #line 911 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 889 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 this.Write("\t\t\t\t}\r\n");
 
         
         #line default
         #line hidden
         
-        #line 912 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
+        #line 890 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt"
 
 	}
 
diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.tt b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.tt
index 3291c68fb6a4..6a5600ebae89 100644
--- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.tt
+++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.tt
@@ -429,7 +429,7 @@ WriteXmlAttributeString(level + 1, member, variableName, isPayload: true, operat
 <#=new string(' ', level * 4)#>				}
 <#+		
 	}
-
+// Only namespaces at the top level Shape matter for a structure, so there is no logic for namespaces here.
 	void ProcessStructure(int level, string variableName, Member member)
 	{
 			var shape = member.Shape.IsList ?  member.Shape.ListShape : member.Shape ;
@@ -442,28 +442,10 @@ WriteXmlAttributeString(level + 1, member, variableName, isPayload: true, operat
 #>
 <#=new string(' ', level * 4)#>				if (<#=variableName#> != null)
 <#=new string(' ', level * 4)#>				{
+<#=new string(' ', level * 4)#>					xmlWriter.WriteStartElement("<#=marshallName#>");
 <#+
-			if (!string.IsNullOrEmpty(member.Shape.XmlNamespace))
-			{
-				if (!string.IsNullOrEmpty(member.Shape.XmlNamespacePrefix))
-				{
-#>
-<#=new string(' ', level * 4)#>					xmlWriter.WriteStartElement("<#=member.Shape.XmlNamespacePrefix#>","<#=marshallName#>","<#=member.Shape.XmlNamespace#>");
-<#+
-				}
-				else
-				{
-#>
-<#=new string(' ', level * 4)#>					xmlWriter.WriteStartElement("<#=marshallName#>","<#=member.Shape.XmlNamespace#>");
-<#+
-				}
-			}
-			else
-			{
 #>
-<#=new string(' ', level * 4)#>					xmlWriter.WriteStartElement("<#=marshallName#>");
 <#+
-			}
 			ProcessMembers(level + 1, variableName, shape.Members);
 #>
 <#=new string(' ', level * 4)#>					xmlWriter.WriteEndElement();
@@ -524,7 +506,7 @@ WriteXmlAttributeString(level + 1, member, variableName, isPayload: true, operat
 				else
 					listMarshallName = member.Shape.ListMarshallName ?? "member";
 				// see https://smithy.io/2.0/spec/protocol-traits.html#xmlflattened-trait
-				if(member.IsFlattened || member.Shape.IsFlattened)
+				if(member.IsFlattened)
 					listMarshallName = member.LocationName ?? member.ModeledName;
 				if(member.Shape.ListShape.IsTimeStamp)
 				{
@@ -855,11 +837,7 @@ WriteXmlAttributeString(level + 1, member, variableName, isPayload: true, operat
 	{
 		var prefix = "";
 		var localName = "";
-		string ns = string.IsNullOrEmpty(member.XmlNamespace) ? member.Shape.XmlNamespace : member.XmlNamespace;
-		// in the rare case like "Type" on "Grantee" in s3, the member or the member's shape doesn't have an xmlNamespace attached
-		// but instead it uses the xmlNamespace on the owning shape. If ns is still null at this point, we use the owning shape's xml namespace
-		if (string.IsNullOrEmpty(ns))
-			ns = member.OwningShape.XmlNamespace;
+		string ns = member.XmlNamespace;
 		if (member.MarshallName.Contains(":"))
 		{
 			var colonIndex = member.MarshallName.IndexOf(":");
@@ -876,13 +854,13 @@ WriteXmlAttributeString(level + 1, member, variableName, isPayload: true, operat
 		if(isPayload)
 		{
 #>
-<#=new string(' ', level * 4)#>					xmlWriter.WriteAttributeString("<#=prefix#>","<#=localName#>","<#=ns#>",<#=member.PrimitiveMarshaller#>(<#=variableName#>.<#=operation.RequestPayloadMember.PropertyName#>.<#=member.PropertyName#>));
+<#=new string(' ', level * 4)#>					xmlWriter.WriteAttributeString("<#=prefix#>","<#=localName#>","<#=member.XmlNamespace#>",<#=member.PrimitiveMarshaller#>(<#=variableName#>.<#=operation.RequestPayloadMember.PropertyName#>.<#=member.PropertyName#>));
 <#+
 		}
 		else
 		{
 #>
-<#=new string(' ', level * 4)#>					xmlWriter.WriteAttributeString("<#=prefix#>","<#=localName#>", "<#=ns#>",<#=member.PrimitiveMarshaller#>(<#=variableName#>.<#=member.PropertyName#>));
+<#=new string(' ', level * 4)#>					xmlWriter.WriteAttributeString("<#=prefix#>","<#=localName#>", "<#=member.XmlNamespace#>",<#=member.PrimitiveMarshaller#>(<#=variableName#>.<#=member.PropertyName#>));
 <#+
 		}
 	}
diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlResponseUnmarshaller.cs b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlResponseUnmarshaller.cs
index 227e2ec95750..d803a2c49e87 100644
--- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlResponseUnmarshaller.cs
+++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlResponseUnmarshaller.cs
@@ -63,7 +63,7 @@ public override string TransformText()
             
             #line default
             #line hidden
-            this.Write("    public partial class ");
+            this.Write("    public class ");
             
             #line 22 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName));
@@ -81,7 +81,7 @@ public override string TransformText()
             
             #line default
             #line hidden
-            this.Write("    public partial class ");
+            this.Write("    public class ");
             
             #line 28 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName));
@@ -223,10 +223,9 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             
             #line default
             #line hidden
-            this.Write("            \r\n            PostUnmarshallCustomization(context, response);\r\n      " +
-                    "      return response;\r\n\t\t}\t\t\r\n");
+            this.Write("            \r\n            return response;\r\n\t\t}\t\t\r\n");
             
-            #line 102 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 101 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
     if ( this.Operation.ResponseHasBodyMembers || shouldMarshallPayload)
     {
@@ -236,7 +235,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("\r\n");
             
-            #line 107 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 106 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
     	if (this.Operation.ResponseBodyMembers.Count == 0 && !shouldMarshallPayload)
 	    {
@@ -247,7 +246,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             this.Write("\t\t[System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Usage\", \"CA1801:Rev" +
                     "iewUnusedParameters\", MessageId=\"response\")]\r\n");
             
-            #line 112 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 111 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
 	    }
 
@@ -256,7 +255,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("\t\tprivate static void UnmarshallResult(XmlUnmarshallerContext context, ");
             
-            #line 115 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 114 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.Name));
             
             #line default
@@ -264,7 +263,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             this.Write("Response response)\r\n        {\r\n            int originalDepth = context.CurrentDep" +
                     "th;\r\n");
             
-            #line 118 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 117 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
     if (this.Config.ServiceModel.Customizations.UnwrapXmlOutput(this.Structure.Name))
     {
@@ -274,7 +273,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("            int targetDepth = 1;\r\n");
             
-            #line 123 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 122 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
     }
     else
@@ -285,7 +284,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("            int targetDepth = originalDepth + 1;\r\n");
             
-            #line 129 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 128 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
         if (payload == null)
         {
@@ -295,7 +294,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("\t\t\tif (context.IsStartOfDocument) \r\n\t\t\t\t   targetDepth += 1;\r\n");
             
-            #line 135 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 134 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
         }
     }
@@ -307,7 +306,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
                     "\n            }\r\n            while (context.Read())\r\n            {\r\n\t\t\t\tif (conte" +
                     "xt.IsStartElement || context.IsAttribute)\r\n                {\r\n");
             
-            #line 147 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 146 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
     
         foreach (var member in this.Operation.ResponseBodyMembers)
         {
@@ -324,7 +323,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("\t\t\t\t}\r\n\t\t\t\telse if (context.IsEndElement && context.CurrentDepth < originalDepth)" +
                     "\r\n                {\r\n                    return;\r\n                }\r\n           " +
-                    " }\r\n            return;\r\n        }\r\n");
+                    " }\r\n          \r\n            return;\r\n        }\r\n");
             
             #line 166 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
@@ -457,17 +456,9 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             
             #line default
             #line hidden
-            this.Write("        }\r\n\r\n        partial void PostUnmarshallCustomization(XmlUnmarshallerCont" +
-                    "ext context, ");
+            this.Write("        }\r\n\r\n");
             
             #line 229 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.Name));
-            
-            #line default
-            #line hidden
-            this.Write("Response response);\r\n\r\n");
-            
-            #line 231 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
     this.AddResponseSingletonMethod();
 
diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlResponseUnmarshaller.tt b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlResponseUnmarshaller.tt
index 8f0eb5c25e5a..4363820ff231 100644
--- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlResponseUnmarshaller.tt
+++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlResponseUnmarshaller.tt
@@ -19,13 +19,13 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
      if (this.Config.ServiceId == "S3")
      {
 #>
-    public partial class <#=this.UnmarshallerBaseName#>ResponseUnmarshaller : S3ReponseUnmarshaller
+    public class <#=this.UnmarshallerBaseName#>ResponseUnmarshaller : S3ReponseUnmarshaller
 <#
      }
      else
      {
 #>
-    public partial class <#=this.UnmarshallerBaseName #>ResponseUnmarshaller : XmlResponseUnmarshaller
+    public class <#=this.UnmarshallerBaseName #>ResponseUnmarshaller : XmlResponseUnmarshaller
 <#
      }
 #>
@@ -96,7 +96,6 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
 	UnmarshallHeaders();
 	ProcessStatusCode();
 #>            
-            PostUnmarshallCustomization(context, response);
             return response;
 		}		
 <#
@@ -161,6 +160,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
                     return;
                 }
             }
+          
             return;
         }
 <#
@@ -226,8 +226,6 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
 #>
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, <#=this.Operation.Name #>Response response);
-
 <#
     this.AddResponseSingletonMethod();
 #>
diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlStructureUnmarshaller.cs b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlStructureUnmarshaller.cs
index 22354d1fc354..ec5db01a44fd 100644
--- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlStructureUnmarshaller.cs
+++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlStructureUnmarshaller.cs
@@ -177,15 +177,13 @@ public override string TransformText()
         // For every member, generate code to add the unmarshalled member to the response object
         foreach (var member in this.Structure.Members)
         {
-            if (this.Config.ServiceModel.Customizations.ShapeModifiers.TryGetValue(this.Structure.Name, out var modifier) && modifier.ExcludedUnmarshallingProperties.Contains(member.ModeledName))
-                continue;
             ProcessResponseBodyOrStructureMembers(member, true, this.Structure);
 
             
             #line default
             #line hidden
             
-            #line 77 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlStructureUnmarshaller.tt"
+            #line 75 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlStructureUnmarshaller.tt"
 
         }
 
@@ -195,7 +193,7 @@ public override string TransformText()
             this.Write("\r\n                    XmlStructureUnmarshallCustomization(context, unmarshalledOb" +
                     "ject, targetDepth);\r\n");
             
-            #line 82 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlStructureUnmarshaller.tt"
+            #line 80 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlStructureUnmarshaller.tt"
 
     }
 
@@ -213,14 +211,14 @@ public override string TransformText()
 
         partial void XmlStructureUnmarshallCustomization(XmlUnmarshallerContext context, ");
             
-            #line 94 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlStructureUnmarshaller.tt"
+            #line 92 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlStructureUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName));
             
             #line default
             #line hidden
             this.Write(" unmarshalledObject, int targetDepth);\r\n\r\n");
             
-            #line 96 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlStructureUnmarshaller.tt"
+            #line 94 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlStructureUnmarshaller.tt"
 
     this.AddStructureSingletonMethod();
 
diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlStructureUnmarshaller.tt b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlStructureUnmarshaller.tt
index 5c042e4d8f73..0a03a62fb683 100644
--- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlStructureUnmarshaller.tt
+++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlStructureUnmarshaller.tt
@@ -70,8 +70,6 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
         // For every member, generate code to add the unmarshalled member to the response object
         foreach (var member in this.Structure.Members)
         {
-            if (this.Config.ServiceModel.Customizations.ShapeModifiers.TryGetValue(this.Structure.Name, out var modifier) && modifier.ExcludedUnmarshallingProperties.Contains(member.ModeledName))
-                continue;
             ProcessResponseBodyOrStructureMembers(member, true, this.Structure);
 #>
 <#
diff --git a/generator/ServiceClientGeneratorLib/ServiceModel.cs b/generator/ServiceClientGeneratorLib/ServiceModel.cs
index 7731c19bccb6..6314f0ec87e7 100644
--- a/generator/ServiceClientGeneratorLib/ServiceModel.cs
+++ b/generator/ServiceClientGeneratorLib/ServiceModel.cs
@@ -535,19 +535,18 @@ public List<Operation> S3AllowListOperations
                         ////// *****
                         new Operation(this, "GetBucketLifecycleConfiguration", DocumentRoot[OperationsKey]["GetBucketLifecycleConfiguration"]),
                         new Operation(this, "GetBucketNotificationConfiguration", DocumentRoot[OperationsKey]["GetBucketNotificationConfiguration"]),
-                        new Operation(this, "GetObjectAcl", DocumentRoot[OperationsKey]["GetObjectAcl"]),
-                        new Operation(this, "HeadObject", DocumentRoot[OperationsKey]["HeadObject"]),
-                        new Operation(this, "ListObjectVersions", DocumentRoot[OperationsKey]["ListObjectVersions"]),
-                        new Operation(this, "PutBucketAcl", DocumentRoot[OperationsKey]["PutBucketAcl"]),
-                        new Operation(this, "PutBucketCors", DocumentRoot[OperationsKey]["PutBucketCors"]),
+                        //////new Operation(this, "GetObjectAcl", DocumentRoot[OperationsKey]["GetObjectAcl"]),
+                        //////new Operation(this, "HeadObject", DocumentRoot[OperationsKey]["HeadObject"]),
+                        //////new Operation(this, "ListObjectVersions", DocumentRoot[OperationsKey]["ListObjectVersions"]),
+                        //////new Operation(this, "PutBucketAcl", DocumentRoot[OperationsKey]["PutBucketAcl"]),
+                        //////new Operation(this, "PutBucketCors", DocumentRoot[OperationsKey]["PutBucketCors"]),
                         ////// **** deprecated
                         //////new Operation(this, "PutBucketLifecycle", DocumentRoot[OperationsKey]["PutBucketLifecycle"]),
                         ////// **** deprecated
                         new Operation(this, "PutBucketLifecycleConfiguration", DocumentRoot[OperationsKey]["PutBucketLifecycleConfiguration"]),
                         new Operation(this, "PutBucketNotificationConfiguration", DocumentRoot[OperationsKey]["PutBucketNotificationConfiguration"]),
-                        new Operation(this, "PutObjectAcl", DocumentRoot[OperationsKey]["PutObjectAcl"]),
+                        //////new Operation(this, "PutObjectAcl", DocumentRoot[OperationsKey]["PutObjectAcl"]),
                         //////new Operation(this, "UploadPartCopy", DocumentRoot[OperationsKey]["UploadPartCopy"]),
-                        new Operation(this, "ListObjectsV2", DocumentRoot[OperationsKey]["ListObjectsV2"]),
 
                     };
                 }
@@ -572,11 +571,7 @@ public List<string> S3AddParametersList
                         "ListDirectoryBuckets",
                         "GetObjectLegalHold",
                         "GetObjectRetention",
-                        "PutObjectRetention",
-                        "PutObjectAcl",
-                        "GetObjectAcl",
-                        "ListObjectsV2",
-                        "ListVersions"
+                        "PutObjectRetention"
                     };
                 }
                 return _s3AddParametersList;
@@ -603,10 +598,7 @@ public List<string> S3RequestMarshallerThrowGenericExceptionList
                     {
                         "CreateSession",
                         "GetObjectAttributes",
-                        "GetBucketAcl",
-                        "PutObjectAcl",
-                        "GetObjectAcl",
-                        "PutBucketAcl"
+                        "GetBucketAcl"
                     };
                 }
                 return _s3RequestMarshallerThrowAmazonS3ExceptionList;
diff --git a/generator/ServiceModels/s3/s3.customizations.json b/generator/ServiceModels/s3/s3.customizations.json
index 9edcfd0db37c..ee499a50ba6f 100644
--- a/generator/ServiceModels/s3/s3.customizations.json
+++ b/generator/ServiceModels/s3/s3.customizations.json
@@ -431,7 +431,7 @@
                     "ID": {"emitPropertyName": "CanonicalUser"}
                 }
             ],
-            "excludeFromUnmarshalling":[
+            "exclude":[
                 "Type"
             ]
         },
@@ -523,119 +523,6 @@
                     "Key" : { "emitPropertyName" : "S3KeyFilter"}
                 }
             ]
-        },
-        "HeadObjectRequest" : {
-            "modify" :[
-                {
-                    "IfModifiedSince" : {"emitPropertyName" : "ModifiedSinceDate"}
-                },
-                {
-                    "IfUnmodifiedSince" : {"emitPropertyName" : "UnmodifiedSinceDate"}
-                },
-                {
-                    "IfMatch" : {"emitPropertyName" : "EtagToMatch"}
-                },
-                {
-                    "IfNoneMatch" : {"emitPropertyName" : "EtagToNotMatch"}
-                },
-                {
-                    "SSECustomerAlgorithm" : {"emitPropertyName": "ServerSideEncryptionCustomerMethod"}
-                },
-                {
-                    "SSECustomerKey" : {"emitPropertyName" : "ServerSideEncryptionCustomerProvidedKey"}
-                },
-                {
-                    "SSECustomerKeyMD5" : {"emitPropertyName":"ServerSideEncryptionCustomerProvidedKeyMD5"}
-                }
-            ],
-            "excludeFromMarshalling":[
-                "ServerSideEncryptionCustomerProvidedKey",
-                "ServerSideEncryptionCustomerProvidedKeyMD5"
-            ]
-        },
-        "HeadObjectOutput":{
-            "modify":[
-                {
-                    "TagCount" : {"emitPropertyName": "TagsCount"}
-                },
-                {
-                    "SSECustomerKeyMD5" : {"emitPropertyName":"ServerSideEncryptionCustomerProvidedKeyMD5"}
-                },
-                {
-                    "SSEKMSEncryptionContext" : {"emitPropertyName":"ServerSideEncryptionKeyManagementServiceEncryptionContext"}
-                },
-                {
-                    "SSEKMSKeyId" : {"emitPropertyName" : "ServerSideEncryptionKeyManagementServiceKeyId"}
-                }
-            ],
-            "exclude":[
-                "Metadata",
-                "DeleteMarker",
-                "SSECustomerAlgorithm",
-                "ServerSideEncryption",
-                "Expires",
-                "Restore"
-            ],
-            "excludeFromUnmarshalling" : [
-                "Expiration"
-            ]
-        },
-        "ListObjectVersionsRequest":{
-            "modify" :[
-                {
-                    "EncodingType" : {"emitPropertyName" : "Encoding"}
-                }
-            ]
-        },
-        "ListObjectVersionsOutput":{
-            "modify" : [
-                {
-                    "EncodingType" : {"emitPropertyName" : "Encoding"}
-                },
-                {
-                    "DeleteMarkers" : {
-                        "skipContextTestExpressionUnmarshallingLogic" : true,
-                        "injectXmlUnmarshallCode" :[
-                            "DeleteItemCustomUnmarshall(context, response);"
-                        ]
-                    }
-                },
-                {
-                    "Versions":{
-                        "skipContextTestExpressionUnmarshallingLogic" : true,
-                        "injectXmlUnmarshallCode" :[
-                            "VersionsItemCustomUnmarshall(context, response);"
-                        ]
-                    }
-                }      
-            ]
-        },
-        "ListObjectsV2Output" : {
-            "modify" : [
-                {
-                    "Contents" : {
-                        "emitPropertyName" : "S3Objects"
-                    }
-                },
-                {
-                    "EncodingType" : {"emitPropertyName" : "Encoding"}
-                },
-                {
-                    "S3Objects": {
-                        "skipContextTestExpressionUnmarshallingLogic" : true,
-                        "injectXmlUnmarshallCode":[
-                            "CustomContentsUnmarshall(context, response);"
-                        ]
-                    }
-                }
-            ]
-        },
-        "ListObjectsV2Request":{
-            "modify" : [
-                {
-                    "EncodingType" : {"emitPropertyName" : "Encoding"}
-                }
-            ]
         }
     },
     "operationModifiers": {
@@ -757,21 +644,6 @@
         },
         "Rule" :{
             "renameShape" : "LifecycleRule"
-        },
-        "AccessControlPolicy":{
-            "renameShape" : "S3AccessControlList"
-        },
-        "ObjectCannedACL":{
-            "renameShape" : "S3CannedACL"
-        },
-        "ObjectVersion" : {
-            "renameShape" : "S3ObjectVersion"
-        },
-        "Object":{
-            "renameShape": "S3Object"
-        },
-        "ObjectStorageClass": {
-             "renameShape": "S3StorageClass"
         }
     },
     "overrideTreatEnumsAsString":{
@@ -842,7 +714,7 @@
                 "Type" : "List<EventType>",
                 "Marshaller" : "StringUtils.FromString",
                 "Unmarshaller" : "StringUnmarshaller",
-                "isFlattened": true,
+                "isFlattened": "true",
                 "alternateLocationName": "Event"
             }
         },
@@ -851,7 +723,7 @@
                 "Type" : "List<EventType>",
                 "Marshaller" : "StringUtils.FromString",
                 "Unmarshaller" : "StringUnmarshaller",
-                "isFlattened": true,
+                "isFlattened": "true",
                 "alternateLocationName" : "Event"
             }
         },
@@ -860,42 +732,9 @@
                 "Type" : "List<EventType>",
                 "Marshaller" : "StringUtils.FromString",
                 "Unmarshaller" : "StringUnmarshaller",
-                "isFlattened": true,
+                "isFlattened": "true",
                 "alternateLocationName" : "Event"
             }
-        },
-        "HeadObjectRequest":{
-            "ServerSideEncryptionCustomerMethod" : {
-                "Type": "ServerSideEncryptionCustomerMethod",
-                "Marshaller": "StringUtils.FromString",
-                "Unmarshaller": "StringUnmarshaller"
-            }
-        },
-        "HeadObjectOutput":{
-            "Expiration":{
-                "Type" : "Expiration",
-                "Marshaller" :"StringUtils.FromString",
-                "Unmarshaller":"StringUnmarshaller"
-            },
-            "DeleteMarker":{
-                "Type":"string",
-                "Marshaller": "StringUtils.FromString",
-                "Unmarshaller": "StringUnmarshaller"
-            }
-        },
-        "ListObjectsV2Output": {
-            "CommonPrefixes" : {
-                "Type": "List<string>",
-                "Marshaller": "StringUtils.FromString",
-                "Unmarshaller" : "CommonPrefixesItemUnmarshaller"
-            }
-        },
-        "ListObjectVersionsOutput" : {
-            "CommonPrefixes" : {
-                "Type": "List<string>",
-                "Marshaller": "StringUtils.FromString",
-                "Unmarshaller" : "CommonPrefixesItemUnmarshaller"
-            }
         }
     },
     "excludeMembers":{
@@ -922,27 +761,6 @@
         "LambdaFunctionConfiguration":[
             "Events",
             "Filter"
-        ],
-        "S3Grantee":[
-            "Type"
-        ],
-        "HeadObjectRequest":[
-            "UnmodifiedSinceDate",
-            "ModifiedSinceDate"
-        ],
-        "S3ObjectVersion":[
-            "ChecksumAlgorithm",
-            "ChecksumType",
-            "ETag",
-            "Size",
-            "StorageClass",
-            "Key",
-            "LastModified",
-            "Owner",
-            "RestoreStatus"
-        ],
-        "ListObjectVersionsOutput":[
-            "DeleteMarkers"
         ]
     },
     "unwrapXmlOutput":{
@@ -963,9 +781,6 @@
         },
         "TopicConfiguration": {
             "alternateBaseClass" : "NotificationConfiguration"
-        },
-        "S3ObjectVersion" :{
-            "alternateBaseClass" : "S3Object"
         }
     },
     "flattenShapes" : {
diff --git a/sdk/src/Services/S3/Generated/Model/GetObjectAclRequest.cs b/sdk/src/Services/S3/Custom/Model/GetObjectACLRequest.cs
similarity index 90%
rename from sdk/src/Services/S3/Generated/Model/GetObjectAclRequest.cs
rename to sdk/src/Services/S3/Custom/Model/GetObjectACLRequest.cs
index b5b82b967325..61072716ac8d 100644
--- a/sdk/src/Services/S3/Generated/Model/GetObjectAclRequest.cs
+++ b/sdk/src/Services/S3/Custom/Model/GetObjectACLRequest.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License").
@@ -13,9 +13,7 @@
  * permissions and limitations under the License.
  */
 
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
+
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
@@ -33,7 +31,7 @@ namespace Amazon.S3.Model
     /// Container for the parameters to the GetObjectAcl operation.
     /// <note> 
     /// <para>
-    /// This operation is not supported for directory buckets.
+    /// This operation is not supported by directory buckets.
     /// </para>
     ///  </note> 
     /// <para>
@@ -101,11 +99,9 @@ public partial class GetObjectAclRequest : AmazonWebServiceRequest
         /// </para>
         ///  
         /// <para>
-        ///  <b>Access points</b> - When you use this action with an access point for general
-        /// purpose buckets, you must provide the alias of the access point in place of the bucket
-        /// name or specify the access point ARN. When you use this action with an access point
-        /// for directory buckets, you must provide the access point name in place of the bucket
-        /// name. When using the access point ARN, you must direct requests to the access point
+        ///  <b>Access points</b> - When you use this action with an access point, you must provide
+        /// the alias of the access point in place of the bucket name or specify the access point
+        /// ARN. When using the access point ARN, you must direct requests to the access point
         /// hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com.
         /// When using this action with an access point through the Amazon Web Services SDKs,
         /// you provide the access point ARN in place of the bucket name. For more information
@@ -142,7 +138,7 @@ public string ExpectedBucketOwner
         // Check to see if ExpectedBucketOwner property is set
         internal bool IsSetExpectedBucketOwner()
         {
-            return this._expectedBucketOwner != null;
+            return !string.IsNullOrEmpty(this._expectedBucketOwner);
         }
 
         /// <summary>
@@ -151,7 +147,7 @@ internal bool IsSetExpectedBucketOwner()
         /// The key of the object for which to get the ACL information.
         /// </para>
         /// </summary>
-        [AWSProperty(Required=true, Min=1)]
+        [AWSProperty(Required = true, Min = 1)]
         public string Key
         {
             get { return this._key; }
@@ -176,7 +172,7 @@ public RequestPayer RequestPayer
         // Check to see if RequestPayer property is set
         internal bool IsSetRequestPayer()
         {
-            return this._requestPayer != null;
+            return !string.IsNullOrEmpty(this._requestPayer);
         }
 
         /// <summary>
diff --git a/sdk/src/Services/S3/Generated/Model/GetObjectAclResponse.cs b/sdk/src/Services/S3/Custom/Model/GetObjectACLResponse.cs
similarity index 78%
rename from sdk/src/Services/S3/Generated/Model/GetObjectAclResponse.cs
rename to sdk/src/Services/S3/Custom/Model/GetObjectACLResponse.cs
index dea605d226ff..716bb7b7eb60 100644
--- a/sdk/src/Services/S3/Generated/Model/GetObjectAclResponse.cs
+++ b/sdk/src/Services/S3/Custom/Model/GetObjectACLResponse.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License").
@@ -13,9 +13,6 @@
  * permissions and limitations under the License.
  */
 
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
@@ -43,11 +40,6 @@ public partial class GetObjectAclResponse : AmazonWebServiceResponse
         /// <para>
         /// A list of grants.
         /// </para>
-        /// <para />
-        /// Starting with version 4 of the SDK this property will default to null. If no data for this property is returned
-        /// from the service the property will also be null. This was changed to improve performance and allow the SDK and caller
-        /// to distinguish between a property not set or a property being empty to clear out a value. To retain the previous
-        /// SDK behavior set the AWSConfigs.InitializeCollections static property to true.
         /// </summary>
         public List<S3Grant> Grants
         {
@@ -58,7 +50,7 @@ public List<S3Grant> Grants
         // Check to see if Grants property is set
         internal bool IsSetGrants()
         {
-            return this._grants != null && (this._grants.Count > 0 || !AWSConfigs.InitializeCollections); 
+            return this._grants != null && (this._grants.Count > 0 || !AWSConfigs.InitializeCollections);
         }
 
         /// <summary>
@@ -91,7 +83,7 @@ public RequestCharged RequestCharged
         // Check to see if RequestCharged property is set
         internal bool IsSetRequestCharged()
         {
-            return this._requestCharged != null;
+            return !string.IsNullOrEmpty(this._requestCharged);
         }
 
     }
diff --git a/sdk/src/Services/S3/Custom/Model/GetObjectMetadataRequest.cs b/sdk/src/Services/S3/Custom/Model/GetObjectMetadataRequest.cs
index e74a5f80d8bb..e7f3dd9820e0 100644
--- a/sdk/src/Services/S3/Custom/Model/GetObjectMetadataRequest.cs
+++ b/sdk/src/Services/S3/Custom/Model/GetObjectMetadataRequest.cs
@@ -23,10 +23,276 @@
 
 namespace Amazon.S3.Model
 {
+    /// <summary>
+    /// Container for the parameters to the GetObjectMetadata operation.
+    /// The <c>HEAD</c> operation retrieves metadata from an object without returning the
+    /// object itself. This operation is useful if you're interested only in an object's metadata.
+    /// 
+    ///  
+    /// <para>
+    /// A <c>HEAD</c> request has the same options as a <c>GET</c> operation on an object.
+    /// The response is identical to the <c>GET</c> response except that there is no response
+    /// body. Because of this, if the <c>HEAD</c> request generates an error, it returns a
+    /// generic code, such as <c>400 Bad Request</c>, <c>403 Forbidden</c>, <c>404 Not Found</c>,
+    /// <c>405 Method Not Allowed</c>, <c>412 Precondition Failed</c>, or <c>304 Not Modified</c>.
+    /// It's not possible to retrieve the exact exception of these error codes.
+    /// </para>
+    ///  
+    /// <para>
+    /// Request headers are limited to 8 KB in size. For more information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/RESTCommonRequestHeaders.html">Common
+    /// Request Headers</a>.
+    /// </para>
+    ///  <note> 
+    /// <para>
+    ///  <b>Directory buckets</b> - For directory buckets, you must make requests for this
+    /// API operation to the Zonal endpoint. These endpoints support virtual-hosted-style
+    /// requests in the format <c>https://<i>bucket_name</i>.s3express-<i>az_id</i>.<i>region</i>.amazonaws.com/<i>key-name</i>
+    /// </c>. Path-style requests are not supported. For more information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/s3-express-Regions-and-Zones.html">Regional
+    /// and Zonal endpoints</a> in the <i>Amazon S3 User Guide</i>.
+    /// </para>
+    ///  </note> <dl> <dt>Permissions</dt> <dd>  <ul> <li> 
+    /// <para>
+    ///  <b>General purpose bucket permissions</b> - To use <c>HEAD</c>, you must have the
+    /// <c>s3:GetObject</c> permission. You need the relevant read object (or version) permission
+    /// for this operation. For more information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/dev/list_amazons3.html">Actions,
+    /// resources, and condition keys for Amazon S3</a> in the <i>Amazon S3 User Guide</i>.
+    /// For more information about the permissions to S3 API operations by S3 resource types,
+    /// see <a href="/AmazonS3/latest/userguide/using-with-s3-policy-actions.html">Required
+    /// permissions for Amazon S3 API operations</a> in the <i>Amazon S3 User Guide</i>.
+    /// </para>
+    ///  
+    /// <para>
+    /// If the object you request doesn't exist, the error that Amazon S3 returns depends
+    /// on whether you also have the <c>s3:ListBucket</c> permission.
+    /// </para>
+    ///  <ul> <li> 
+    /// <para>
+    /// If you have the <c>s3:ListBucket</c> permission on the bucket, Amazon S3 returns an
+    /// HTTP status code <c>404 Not Found</c> error.
+    /// </para>
+    ///  </li> <li> 
+    /// <para>
+    /// If you don’t have the <c>s3:ListBucket</c> permission, Amazon S3 returns an HTTP status
+    /// code <c>403 Forbidden</c> error.
+    /// </para>
+    ///  </li> </ul> </li> <li> 
+    /// <para>
+    ///  <b>Directory bucket permissions</b> - To grant access to this API operation on a
+    /// directory bucket, we recommend that you use the <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_CreateSession.html">
+    /// <c>CreateSession</c> </a> API operation for session-based authorization. Specifically,
+    /// you grant the <c>s3express:CreateSession</c> permission to the directory bucket in
+    /// a bucket policy or an IAM identity-based policy. Then, you make the <c>CreateSession</c>
+    /// API call on the bucket to obtain a session token. With the session token in your request
+    /// header, you can make API requests to this operation. After the session token expires,
+    /// you make another <c>CreateSession</c> API call to generate a new session token for
+    /// use. Amazon Web Services CLI or SDKs create session and refresh the session token
+    /// automatically to avoid service interruptions when a session expires. For more information
+    /// about authorization, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_CreateSession.html">
+    /// <c>CreateSession</c> </a>.
+    /// </para>
+    ///  </li> </ul> </dd> <dt>Encryption</dt> <dd> <note> 
+    /// <para>
+    /// Encryption request headers, like <c>x-amz-server-side-encryption</c>, should not be
+    /// sent for <c>HEAD</c> requests if your object uses server-side encryption with Key
+    /// Management Service (KMS) keys (SSE-KMS), dual-layer server-side encryption with Amazon
+    /// Web Services KMS keys (DSSE-KMS), or server-side encryption with Amazon S3 managed
+    /// encryption keys (SSE-S3). The <c>x-amz-server-side-encryption</c> header is used when
+    /// you <c>PUT</c> an object to S3 and want to specify the encryption method. If you include
+    /// this header in a <c>HEAD</c> request for an object that uses these types of keys,
+    /// you’ll get an HTTP <c>400 Bad Request</c> error. It's because the encryption method
+    /// can't be changed when you retrieve the object.
+    /// </para>
+    ///  </note> 
+    /// <para>
+    /// If you encrypt an object by using server-side encryption with customer-provided encryption
+    /// keys (SSE-C) when you store the object in Amazon S3, then when you retrieve the metadata
+    /// from the object, you must use the following headers to provide the encryption key
+    /// for the server to be able to retrieve the object's metadata. The headers are: 
+    /// </para>
+    ///  <ul> <li> 
+    /// <para>
+    ///  <c>x-amz-server-side-encryption-customer-algorithm</c> 
+    /// </para>
+    ///  </li> <li> 
+    /// <para>
+    ///  <c>x-amz-server-side-encryption-customer-key</c> 
+    /// </para>
+    ///  </li> <li> 
+    /// <para>
+    ///  <c>x-amz-server-side-encryption-customer-key-MD5</c> 
+    /// </para>
+    ///  </li> </ul> 
+    /// <para>
+    /// For more information about SSE-C, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/dev/ServerSideEncryptionCustomerKeys.html">Server-Side
+    /// Encryption (Using Customer-Provided Encryption Keys)</a> in the <i>Amazon S3 User
+    /// Guide</i>.
+    /// </para>
+    ///  <note> 
+    /// <para>
+    ///  <b>Directory bucket permissions</b> - For directory buckets, only server-side encryption
+    /// with Amazon S3 managed keys (SSE-S3) (<c>AES256</c>) is supported.
+    /// </para>
+    ///  </note> </dd> <dt>Versioning</dt> <dd> <ul> <li> 
+    /// <para>
+    /// If the current version of the object is a delete marker, Amazon S3 behaves as if the
+    /// object was deleted and includes <c>x-amz-delete-marker: true</c> in the response.
+    /// </para>
+    ///  </li> <li> 
+    /// <para>
+    /// If the specified version is a delete marker, the response returns a <c>405 Method
+    /// Not Allowed</c> error and the <c>Last-Modified: timestamp</c> response header.
+    /// </para>
+    ///  </li> </ul> <note> <ul> <li> 
+    /// <para>
+    ///  <b>Directory buckets</b> - Delete marker is not supported by directory buckets.
+    /// </para>
+    ///  </li> <li> 
+    /// <para>
+    ///  <b>Directory buckets</b> - S3 Versioning isn't enabled and supported for directory
+    /// buckets. For this API operation, only the <c>null</c> value of the version ID is supported
+    /// by directory buckets. You can only specify <c>null</c> to the <c>versionId</c> query
+    /// parameter in the request.
+    /// </para>
+    ///  </li> </ul> </note> </dd> <dt>HTTP Host header syntax</dt> <dd> 
+    /// <para>
+    ///  <b>Directory buckets </b> - The HTTP Host header syntax is <c> <i>Bucket_name</i>.s3express-<i>az_id</i>.<i>region</i>.amazonaws.com</c>.
+    /// </para>
+    ///  </dd> </dl> 
+    /// <para>
+    /// The following actions are related to <c>HeadObject</c>:
+    /// </para>
+    ///  <ul> <li> 
+    /// <para>
+    ///  <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html">GetObject</a>
+    /// 
+    /// </para>
+    ///  </li> <li> 
+    /// <para>
+    ///  <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectAttributes.html">GetObjectAttributes</a>
+    /// 
+    /// </para>
+    ///  </li> </ul>
+    /// </summary>
     public partial class GetObjectMetadataRequest : AmazonWebServiceRequest
     {
+        private string bucketName;
+        private ChecksumMode _checksumMode;
         DateTime? modifiedSinceDate;
         DateTime? unmodifiedSinceDate;
+        string etagToMatch;
+        string etagToNotMatch;
+        private string key;
+        private string versionId;
+        private int? partNumber;
+        private RequestPayer requestPayer;
+        private string expectedBucketOwner;
+        private string _responseCacheControl;
+        private string _responseContentDisposition;
+        private string _responseContentEncoding;
+        private string _responseContentLanguage;
+        private string _responseContentType;
+        private DateTime? _responseExpires;
+        private ServerSideEncryptionCustomerMethod serverSideCustomerEncryption;
+        private string serverSideEncryptionCustomerProvidedKey;
+        private string serverSideEncryptionCustomerProvidedKeyMD5;
+
+
+        /// <summary>
+        /// Gets and sets the property BucketName. 
+        /// <para>
+        /// The name of the bucket that contains the object.
+        /// </para>
+        ///  
+        /// <para>
+        ///  <b>Directory buckets</b> - When you use this operation with a directory bucket, you
+        /// must use virtual-hosted-style requests in the format <c> <i>Bucket_name</i>.s3express-<i>az_id</i>.<i>region</i>.amazonaws.com</c>.
+        /// Path-style requests are not supported. Directory bucket names must be unique in the
+        /// chosen Availability Zone. Bucket names must follow the format <c> <i>bucket_base_name</i>--<i>az-id</i>--x-s3</c>
+        /// (for example, <c> <i>amzn-s3-demo-bucket</i>--<i>usw2-az1</i>--x-s3</c>). For information
+        /// about bucket naming restrictions, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/directory-bucket-naming-rules.html">Directory
+        /// bucket naming rules</a> in the <i>Amazon S3 User Guide</i>.
+        /// </para>
+        ///  
+        /// <para>
+        ///  <b>Access points</b> - When you use this action with an access point, you must provide
+        /// the alias of the access point in place of the bucket name or specify the access point
+        /// ARN. When using the access point ARN, you must direct requests to the access point
+        /// hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com.
+        /// When using this action with an access point through the Amazon Web Services SDKs,
+        /// you provide the access point ARN in place of the bucket name. For more information
+        /// about access point ARNs, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html">Using
+        /// access points</a> in the <i>Amazon S3 User Guide</i>.
+        /// </para>
+        ///  <note> 
+        /// <para>
+        /// Access points and Object Lambda access points are not supported by directory buckets.
+        /// </para>
+        ///  </note> 
+        /// <para>
+        ///  <b>S3 on Outposts</b> - When you use this action with Amazon S3 on Outposts, you
+        /// must direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname takes
+        /// the form <c> <i>AccessPointName</i>-<i>AccountId</i>.<i>outpostID</i>.s3-outposts.<i>Region</i>.amazonaws.com</c>.
+        /// When you use this action with S3 on Outposts through the Amazon Web Services SDKs,
+        /// you provide the Outposts access point ARN in place of the bucket name. For more information
+        /// about S3 on Outposts ARNs, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html">What
+        /// is S3 on Outposts?</a> in the <i>Amazon S3 User Guide</i>.
+        /// </para>
+        /// </summary>
+        public string BucketName
+        {
+            get { return this.bucketName; }
+            set { this.bucketName = value; }
+        }
+
+        // Check to see if BucketName property is set
+        internal bool IsSetBucketName()
+        {
+            return this.bucketName != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property ChecksumMode. 
+        /// <para>
+        /// This must be enabled to retrieve the checksum.
+        /// </para>
+        ///  
+        /// <para> 
+        /// <b>General purpose buckets</b> - If you enable checksum mode and the object is uploaded with a <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_Checksum.html">checksum</a> 
+        /// and encrypted with an Key Management Service (KMS) key, you must have permission to use the <c>kms:Decrypt</c> action to retrieve the checksum.</para>
+        /// 
+        /// <para> 
+        /// <b>Directory buckets</b> - If you enable <c>ChecksumMode</c> and the object is encrypted with Amazon Web Services Key Management Service (Amazon Web Services KMS), 
+        /// you must also have the <c>kms:GenerateDataKey</c> and <c>kms:Decrypt</c> permissions in IAM identity-based policies and KMS key policies for the KMS key to retrieve the 
+        /// checksum of the object.
+        /// </para>
+        /// </summary>
+        public ChecksumMode ChecksumMode
+        {
+            get { return this._checksumMode; }
+            set { this._checksumMode = value; }
+        }
+
+        // Check to see if ChecksumMode property is set
+        internal bool IsSetChecksumMode()
+        {
+            return this._checksumMode != null;
+        }
+
+        /// <summary>
+        /// ETag to be matched as a pre-condition for returning the object,
+        /// otherwise a PreconditionFailed signal is returned.
+        /// </summary>
+        public string EtagToMatch
+        {
+            get { return this.etagToMatch; }
+            set { this.etagToMatch = value; }
+        }
+
+        // Check to see if EtagToMatch property is set
+        internal bool IsSetEtagToMatch()
+        {
+            return this.etagToMatch != null;
+        }
 
         /// <summary>
         /// Returns the object only if it has been modified since the specified time, 
@@ -54,6 +320,22 @@ internal bool IsSetModifiedSinceDate()
             return this.modifiedSinceDate.HasValue;
         }
 
+        /// <summary>
+        /// ETag that should not be matched as a pre-condition for returning the object,
+        /// otherwise a NotModified (304) signal is returned.
+        /// </summary>
+        public string EtagToNotMatch
+        {
+            get { return this.etagToNotMatch; }
+            set { this.etagToNotMatch = value; }
+        }
+
+        // Check to see if EtagToNotMatch property is set
+        internal bool IsSetEtagToNotMatch()
+        {
+            return this.etagToNotMatch != null;
+        }
+
         /// <summary>
         /// Returns the object only if it has not been modified since the specified time, 
         /// otherwise returns a PreconditionFailed.
@@ -79,5 +361,321 @@ internal bool IsSetUnmodifiedSinceDate()
         {
             return this.unmodifiedSinceDate.HasValue;
         }
+
+        /// <summary>
+        /// The key of the object.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This property will be used as part of the resource path of the HTTP request. In .NET the System.Uri class
+        /// is used to construct the uri for the request. The System.Uri class will canonicalize the uri string by compacting characters like "..". 
+        /// For example an object key of "foo/../bar/file.txt" will be transformed into "bar/file.txt" because the ".." 
+        /// is interpreted as use parent directory.
+        /// </para>
+        /// <para>
+        /// Starting with .NET 8, the AWS .NET SDK disables System.Uri's feature of canonicalizing the resource path. This allows S3 keys like
+        /// "foo/../bar/file.txt" to work correctly with the AWS .NET SDK.
+        /// </para>
+        /// <para>
+        /// For further information view the documentation for the Uri class: https://docs.microsoft.com/en-us/dotnet/api/system.uri
+        /// </para>
+        /// </remarks>
+        public string Key
+        {
+            get { return this.key; }
+            set { this.key = value; }
+        }
+
+        // Check to see if Key property is set
+        internal bool IsSetKey()
+        {
+            return this.key != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property VersionId. 
+        /// <para>
+        /// Version ID used to reference a specific version of the object.
+        /// </para>
+        ///  <note> 
+        /// <para>
+        /// For directory buckets in this API operation, only the <c>null</c> value of the
+        /// version ID is supported.
+        /// </para>
+        ///  </note>
+        /// </summary>
+        public string VersionId
+        {
+            get { return this.versionId; }
+            set { this.versionId = value; }
+        }
+
+        // Check to see if VersionId property is set
+        internal bool IsSetVersionId()
+        {
+            return this.versionId != null;
+        }
+
+        /// <summary>
+        /// The Server-side encryption algorithm to be used with the customer provided key.
+        ///  
+        ///  <note> 
+        /// <para>
+        /// This functionality is not supported for directory buckets.
+        /// </para>
+        ///  </note>
+        /// </summary>
+        public ServerSideEncryptionCustomerMethod ServerSideEncryptionCustomerMethod
+        {
+            get { return this.serverSideCustomerEncryption; }
+            set { this.serverSideCustomerEncryption = value; }
+        }
+
+        // Check to see if ServerSideEncryptionCustomerMethod property is set
+        internal bool IsSetServerSideEncryptionCustomerMethod()
+        {
+            return this.serverSideCustomerEncryption != null && this.serverSideCustomerEncryption != ServerSideEncryptionCustomerMethod.None;
+        }
+
+        /// <summary>
+        /// The base64-encoded encryption key for Amazon S3 to use to decrypt the object
+        /// <para>
+        /// Using the encryption key you provide as part of your request Amazon S3 manages both the encryption, as it writes 
+        /// to disks, and decryption, when you access your objects. Therefore, you don't need to maintain any data encryption code. The only 
+        /// thing you do is manage the encryption keys you provide.
+        /// </para>
+        /// <para>
+        /// When you retrieve an object, you must provide the same encryption key as part of your request. Amazon S3 first verifies 
+        /// the encryption key you provided matches, and then decrypts the object before returning the object data to you.
+        /// </para>
+        /// <para>
+        /// Important: Amazon S3 does not store the encryption key you provide.
+        /// </para>
+        ///  <note> 
+        /// <para>
+        /// This functionality is not supported for directory buckets.
+        /// </para>
+        ///  </note>
+        /// </summary>
+        [AWSProperty(Sensitive=true)]
+        public string ServerSideEncryptionCustomerProvidedKey
+        {
+            get { return this.serverSideEncryptionCustomerProvidedKey; }
+            set { this.serverSideEncryptionCustomerProvidedKey = value; }
+        }
+
+        /// <summary>
+        /// Checks if ServerSideEncryptionCustomerProvidedKey property is set.
+        /// </summary>
+        /// <returns>true if ServerSideEncryptionCustomerProvidedKey property is set.</returns>
+        internal bool IsSetServerSideEncryptionCustomerProvidedKey()
+        {
+            return !System.String.IsNullOrEmpty(this.serverSideEncryptionCustomerProvidedKey);
+        }
+
+        /// <summary>
+        /// The MD5 of the customer encryption key specified in the ServerSideEncryptionCustomerProvidedKey property. The MD5 is
+        /// base 64 encoded. This field is optional, the SDK will calculate the MD5 if this is not set.
+        /// </summary>
+        ///  <note> 
+        /// <para>
+        /// This functionality is not supported for directory buckets.
+        /// </para>
+        ///  </note>
+        public string ServerSideEncryptionCustomerProvidedKeyMD5
+        {
+            get { return this.serverSideEncryptionCustomerProvidedKeyMD5; }
+            set { this.serverSideEncryptionCustomerProvidedKeyMD5 = value; }
+        }
+
+        /// <summary>
+        /// Checks if ServerSideEncryptionCustomerProvidedKeyMD5 property is set.
+        /// </summary>
+        /// <returns>true if ServerSideEncryptionCustomerProvidedKey property is set.</returns>
+        internal bool IsSetServerSideEncryptionCustomerProvidedKeyMD5()
+        {
+            return !System.String.IsNullOrEmpty(this.serverSideEncryptionCustomerProvidedKeyMD5);
+        }
+
+        /// <summary>
+        /// Part number of the object being read. This is a positive integer between 1 and 10,000.
+        /// Effectively performs a 'ranged' HEAD request for the part specified.
+        /// Useful querying about the size of the part and the number of parts in this object.
+        /// </summary>
+        public int? PartNumber
+        {
+            get { return this.partNumber; }
+            set
+            {
+                if (value.HasValue)
+                {
+                    if (value < 1 || 10000 < value)
+                    {
+                        throw new ArgumentException("PartNumber must be a positve integer between 1 and 10,000.");
+                    }
+                }
+                
+                this.partNumber = value;
+            }
+       }
+
+        /// <summary>
+        /// Check if PartNumber property is set.
+        /// </summary>
+        /// <returns>true if PartNumber property is set.</returns>
+        internal bool IsSetPartNumber()
+        {
+            return this.partNumber.HasValue;
+        }
+
+        /// <summary>
+        /// Confirms that the requester knows that she or he will be charged for the request.
+        /// Bucket owners need not specify this parameter in their requests.
+        /// </summary>
+        public RequestPayer RequestPayer
+        {
+            get { return this.requestPayer; }
+            set { this.requestPayer = value; }
+        }
+
+        /// <summary>
+        /// Checks to see if RequetsPayer is set.
+        /// </summary>
+        /// <returns>true, if RequestPayer property is set.</returns>
+        internal bool IsSetRequestPayer()
+        {
+            return requestPayer != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property ExpectedBucketOwner. 
+        /// <para>
+        /// The account ID of the expected bucket owner. If the account ID that you provide does
+        /// not match the actual owner of the bucket, the request fails with the HTTP status code
+        /// <c>403 Forbidden</c> (access denied).
+        /// </para>
+        /// </summary>
+        public string ExpectedBucketOwner
+        {
+            get { return this.expectedBucketOwner; }
+            set { this.expectedBucketOwner = value; }
+        }
+
+        /// <summary>
+        /// Checks to see if ExpectedBucketOwner is set.
+        /// </summary>
+        /// <returns>true, if ExpectedBucketOwner property is set.</returns>
+        internal bool IsSetExpectedBucketOwner()
+        {
+            return !String.IsNullOrEmpty(this.expectedBucketOwner);
+        }
+
+        /// <summary>
+        /// Gets and sets the property ResponseCacheControl. 
+        /// <para>
+        /// Sets the <c>Cache-Control</c> header of the response.
+        /// </para>
+        /// </summary>
+        public string ResponseCacheControl
+        {
+            get { return this._responseCacheControl; }
+            set { this._responseCacheControl = value; }
+        }
+
+        // Check to see if ResponseCacheControl property is set
+        internal bool IsSetResponseCacheControl()
+        {
+            return this._responseCacheControl != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property ResponseContentDisposition. 
+        /// <para>
+        /// Sets the <c>Content-Disposition</c> header of the response.
+        /// </para>
+        /// </summary>
+        public string ResponseContentDisposition
+        {
+            get { return this._responseContentDisposition; }
+            set { this._responseContentDisposition = value; }
+        }
+
+        // Check to see if ResponseContentDisposition property is set
+        internal bool IsSetResponseContentDisposition()
+        {
+            return this._responseContentDisposition != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property ResponseContentEncoding. 
+        /// <para>
+        /// Sets the <c>Content-Encoding</c> header of the response.
+        /// </para>
+        /// </summary>
+        public string ResponseContentEncoding
+        {
+            get { return this._responseContentEncoding; }
+            set { this._responseContentEncoding = value; }
+        }
+
+        // Check to see if ResponseContentEncoding property is set
+        internal bool IsSetResponseContentEncoding()
+        {
+            return this._responseContentEncoding != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property ResponseContentLanguage. 
+        /// <para>
+        /// Sets the <c>Content-Language</c> header of the response.
+        /// </para>
+        /// </summary>
+        public string ResponseContentLanguage
+        {
+            get { return this._responseContentLanguage; }
+            set { this._responseContentLanguage = value; }
+        }
+
+        // Check to see if ResponseContentLanguage property is set
+        internal bool IsSetResponseContentLanguage()
+        {
+            return this._responseContentLanguage != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property ResponseContentType. 
+        /// <para>
+        /// Sets the <c>Content-Type</c> header of the response.
+        /// </para>
+        /// </summary>
+        public string ResponseContentType
+        {
+            get { return this._responseContentType; }
+            set { this._responseContentType = value; }
+        }
+
+        // Check to see if ResponseContentType property is set
+        internal bool IsSetResponseContentType()
+        {
+            return this._responseContentType != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property ResponseExpires. 
+        /// <para>
+        /// Sets the <c>Expires</c> header of the response.
+        /// </para>
+        /// </summary>
+        public DateTime? ResponseExpires
+        {
+            get { return this._responseExpires; }
+            set { this._responseExpires = value; }
+        }
+
+        // Check to see if ResponseExpires property is set
+        internal bool IsSetResponseExpires()
+        {
+            return this._responseExpires.HasValue;
+        }
     }
 }
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Custom/Model/GetObjectMetadataResponse.cs b/sdk/src/Services/S3/Custom/Model/GetObjectMetadataResponse.cs
index 5e5c2a53f138..5b654b68d233 100644
--- a/sdk/src/Services/S3/Custom/Model/GetObjectMetadataResponse.cs
+++ b/sdk/src/Services/S3/Custom/Model/GetObjectMetadataResponse.cs
@@ -26,15 +26,40 @@ namespace Amazon.S3.Model
     /// <summary>
     /// Returns information about the  HeadObject response and response metadata.
     /// </summary>
-    public partial class GetObjectMetadataResponse : AmazonWebServiceResponse
+    public class GetObjectMetadataResponse : AmazonWebServiceResponse
     {
         private string deleteMarker;
+        private string acceptRanges;
+        private string contentRange;
+        private Expiration expiration;
         private DateTime? restoreExpiration;
         private bool? restoreInProgress;
+        private DateTime? lastModified;
+        private string eTag;
+        private int? missingMeta;
+        private string versionId;
+        private string websiteRedirectLocation;
+        private string serverSideEncryptionKeyManagementServiceKeyId;
         private ServerSideEncryptionMethod serverSideEncryption;
         private ServerSideEncryptionCustomerMethod serverSideEncryptionCustomerMethod;
         private HeadersCollection headersCollection = new HeadersCollection();
         private MetadataCollection metadataCollection = new MetadataCollection();
+        private ReplicationStatus replicationStatus;
+        private ArchiveStatus archiveStatus;
+        private int? partsCount;
+        private int? tagsCount;
+        private ObjectLockLegalHoldStatus objectLockLegalHoldStatus;
+        private ObjectLockMode objectLockMode;
+        private DateTime? objectLockRetainUntilDate;
+        private S3StorageClass storageClass;
+        private RequestCharged requestCharged;
+        private bool? bucketKeyEnabled;
+        private string _checksumCRC32;
+        private string _checksumCRC32C;
+        private string _checksumCRC64NVME;
+        private string _checksumSHA1;
+        private string _checksumSHA256;
+        private ChecksumType _checksumType;
 
         /// <summary>
         /// The date and time at which the object is no longer cacheable.
@@ -91,6 +116,59 @@ internal bool IsSetDeleteMarker()
             return this.deleteMarker != null;
         }
 
+        /// <summary>
+        /// Gets and sets the AcceptRanges.
+        /// </summary>
+        public string AcceptRanges
+        {
+            get { return this.acceptRanges; }
+            set { this.acceptRanges = value; }
+        }
+
+        // Check to see if AcceptRanges property is set
+        internal bool IsSetAcceptRanges()
+        {
+            return this.acceptRanges != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the ContentRange.
+        /// </summary>
+        public string ContentRange
+        {
+            get { return this.contentRange; }
+            set { this.contentRange = value; }
+        }
+
+        // Check to see if ContentRange property is set
+        internal bool IsSetContentRange()
+        {
+            return this.contentRange != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property Expiration. 
+        /// <para>
+        /// If the object expiration is configured, this will contain the expiration date (<c>expiry-date</c>)
+        /// and rule ID (<c>rule-id</c>). The value of <c>rule-id</c> is URL encoded.
+        /// </para>
+        /// <para>
+        /// Object expiration information is not returned for directory buckets (for those, the
+        /// response header will contain the value <c>"NotImplemented"</c>).
+        /// </para>
+        /// </summary>
+        public Expiration Expiration
+        {
+            get { return this.expiration; }
+            set { this.expiration = value; }
+        }
+
+        // Check to see if Expiration property is set
+        internal bool IsSetExpiration()
+        {
+            return this.expiration != null;
+        }
+
         /// <summary>
         /// Gets and sets the RestoreExpiration property.
         /// <para>
@@ -124,6 +202,114 @@ public bool? RestoreInProgress
             set { this.restoreInProgress = value; }
         }
 
+        /// <summary>
+        /// Gets and sets the property LastModified. 
+        /// <para>
+        /// Date and time when the object was last modified.
+        /// </para>
+        /// </summary>
+        public DateTime? LastModified
+        {
+            get { return this.lastModified; }
+            set { this.lastModified = value; }
+        }
+
+        // Check to see if LastModified property is set
+        internal bool IsSetLastModified()
+        {
+            return this.lastModified.HasValue;
+        }
+
+        /// <summary>
+        /// An ETag is an opaque identifier assigned by a web server to a specific version of a resource found at a URL
+        ///  
+        /// </summary>
+        public string ETag
+        {
+            get { return this.eTag; }
+            set { this.eTag = value; }
+        }
+
+        // Check to see if ETag property is set
+        internal bool IsSetETag()
+        {
+            return this.eTag != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property MissingMeta. 
+        /// <para>
+        /// This is set to the number of metadata entries not returned in <code>x-amz-meta</code>
+        /// headers. This can happen if you create metadata using an API like SOAP that supports
+        /// more flexible metadata than the REST API. For example, using SOAP, you can create
+        /// metadata whose values are not legal HTTP headers.
+        /// </para>
+        ///  <note> 
+        /// <para>
+        /// This functionality is not supported for directory buckets.
+        /// </para>
+        ///  </note>
+        /// </summary>
+        public int? MissingMeta
+        {
+            get { return this.missingMeta; }
+            set { this.missingMeta = value; }
+        }
+
+        // Check to see if MissingMeta property is set
+        internal bool IsSetMissingMeta()
+        {
+            return this.missingMeta.HasValue;
+        }
+
+        /// <summary>
+        /// Gets and sets the property VersionId. 
+        /// <para>
+        /// Version ID of the object.
+        /// </para>
+        ///  <note> 
+        /// <para>
+        /// This functionality is not supported for directory buckets.
+        /// </para>
+        ///  </note>
+        /// </summary>
+        public string VersionId
+        {
+            get { return this.versionId; }
+            set { this.versionId = value; }
+        }
+
+        // Check to see if VersionId property is set
+        internal bool IsSetVersionId()
+        {
+            return this.versionId != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property WebsiteRedirectLocation. 
+        /// <para>
+        /// If the bucket is configured as a website, redirects requests for this object to another
+        /// object in the same bucket or to an external URL. Amazon S3 stores the value of this
+        /// header in the object metadata.
+        /// </para>
+        ///  <note> 
+        /// <para>
+        /// This functionality is not supported for directory buckets.
+        /// </para>
+        ///  </note>
+        /// </summary>
+        public string WebsiteRedirectLocation
+        {
+            get { return this.websiteRedirectLocation; }
+            set { this.websiteRedirectLocation = value; }
+        }
+
+        // Check to see if WebsiteRedirectLocation property is set
+        internal bool IsSetWebsiteRedirectLocation()
+        {
+            return this.websiteRedirectLocation != null;
+        }
+
         /// <summary>
         /// The server-side encryption algorithm used when storing this object in Amazon S3 or Amazon FSx.
         /// <para>
@@ -180,6 +366,419 @@ internal bool IsSetServerSideEncryptionCustomerMethod()
         {
             return this.serverSideEncryptionCustomerMethod != null;
         }
+
+        /// <summary>
+        /// <para>
+        /// If present, indicates the ID of the KMS key that was used for object encryption.
+        /// </para>
+        /// </summary>
+        [AWSProperty(Sensitive=true)]
+        public string ServerSideEncryptionKeyManagementServiceKeyId
+        {
+            get { return this.serverSideEncryptionKeyManagementServiceKeyId; }
+            set { this.serverSideEncryptionKeyManagementServiceKeyId = value; }
+        }
+
+        /// <summary>
+        /// Checks if ServerSideEncryptionKeyManagementServiceKeyId property is set.
+        /// </summary>
+        /// <returns>true if ServerSideEncryptionKeyManagementServiceKeyId property is set.</returns>
+        internal bool IsSetServerSideEncryptionKeyManagementServiceKeyId()
+        {
+            return !System.String.IsNullOrEmpty(this.serverSideEncryptionKeyManagementServiceKeyId);
+        }
+
+        /// <summary>
+        /// <p>Amazon S3 can return this header if your request involves a 
+        /// bucket that is either a source or a destination in a replication rule.</p> <p>In replication,
+        /// you have a source bucket on which you configure replication and destination bucket or buckets 
+        /// where Amazon S3 stores object replicas. When you request an object (<code>GetObject</code>) or
+        /// object metadata (<code>HeadObject</code>) from these buckets, Amazon S3 will 
+        /// return the <code>x-amz-replication-status</code> header in the response as follows:</p> 
+        /// <ul> <li> <p>If requesting an object from the source bucket, Amazon S3 will return the 
+        /// <code>x-amz-replication-status</code> header if the object in your request is eligible for 
+        /// replication.</p> <p> For example, suppose that in your replication configuration, you specify 
+        /// object prefix <code>TaxDocs</code> requesting Amazon S3 to replicate objects with key 
+        /// prefix <code>TaxDocs</code>. Any objects you upload with this key name prefix, for example 
+        /// <code>TaxDocs/document1.pdf</code>, are eligible for replication. For any object request with 
+        /// this key name prefix, Amazon S3 will return the <code>x-amz-replication-status</code> header 
+        /// with value PENDING, COMPLETED or FAILED indicating object replication status.</p> </li> <li> <p>If 
+        /// requesting an object from a destination bucket, Amazon S3 will return the 
+        /// <code>x-amz-replication-status</code> header with value REPLICA if the object in your 
+        /// request is a replica that Amazon S3 created.</p> </li> <li> <p>When replicating objects 
+        /// to multiple destination buckets the <code>x-amz-replication-status</code> header acts differently. 
+        /// The header of the source object will only return a value of COMPLETED when replication is 
+        /// successful to all destinations. The header will remain at value PENDING until replication has 
+        /// completed for all destinations. If one or more destinations fails replication the header will 
+        /// return FAILED. </p> </li> </ul> <p>For more information, 
+        /// see <a href="https://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html\">Replication</a>.</p>
+        /// </summary>
+        ///  <note> 
+        /// <para>
+        /// This functionality is not supported for directory buckets.
+        /// </para>
+        ///  </note>
+        public ReplicationStatus ReplicationStatus
+        {
+            get { return this.replicationStatus; }
+            set { this.replicationStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the property ArchiveStatus. 
+        /// <para>
+        /// The archive state of the head object.
+        /// </para>
+        ///  <note> 
+        /// <para>
+        /// This functionality is not supported for directory buckets.
+        /// </para>
+        ///  </note>
+        /// </summary>
+        public ArchiveStatus ArchiveStatus
+        {
+            get { return this.archiveStatus; }
+            set { this.archiveStatus = value; }
+        }
+
+        /// <summary>
+        /// Checks if ReplicationStatus property is set.
+        /// </summary>
+        /// <returns>true if ReplicationStatus property is set.</returns>
+        internal bool IsSetReplicationStatus()
+        {
+            return ReplicationStatus != null;
+        }
+
+        /// <summary>
+        /// The count of parts this object has.
+        /// </summary>
+        public int? PartsCount
+        {
+            get { return this.partsCount; }
+            set { this.partsCount = value; }
+        }
+
+        // Check to see if PartsCount property is set
+        internal bool IsSetPartsCount()
+        {
+            return this.partsCount.HasValue;
+        }
+
+        /// <summary>
+        /// The count of tags this object has.
+        /// <para>
+        /// The number of tags, if any, on the object, when you have the relevant permission 
+        /// to read object tags.
+        /// </para>
+        ///  
+        /// <para>
+        /// You can use <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectTagging.html">GetObjectTagging</a>
+        /// to retrieve the tag set associated with an object.
+        /// </para>
+        ///  <note> 
+        /// <para>
+        /// This functionality is not supported for directory buckets.
+        /// </para>
+        ///  </note>
+        /// </summary>
+        public int? TagsCount
+        {
+            get { return this.tagsCount; }
+            set { this.tagsCount = value; }
+        }
+
+        // Check to see if TagsCount property is set
+        internal bool IsSetTagsCount()
+        {
+            return this.tagsCount.HasValue;
+        }
+
+        /// <summary>
+        /// Gets and sets the property ObjectLockLegalHoldStatus. 
+        /// <para>
+        /// Specifies whether a legal hold is in effect for this object. This header is only returned
+        /// if the requester has the <code>s3:GetObjectLegalHold</code> permission. This header
+        /// is not returned if the specified version of this object has never had a legal hold
+        /// applied. For more information about S3 Object Lock, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html">Object
+        /// Lock</a>.
+        /// </para>
+        ///  <note> 
+        /// <para>
+        /// This functionality is not supported for directory buckets.
+        /// </para>
+        ///  </note>
+        /// </summary>
+        public ObjectLockLegalHoldStatus ObjectLockLegalHoldStatus
+        {
+            get { return this.objectLockLegalHoldStatus; }
+            set { this.objectLockLegalHoldStatus = value; }
+        }
+
+        // Check to see if ObjectLockLegalHoldStatus property is set
+        internal bool IsSetObjectLockLegalHoldStatus()
+        {
+            return this.objectLockLegalHoldStatus != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property ObjectLockMode. 
+        /// <para>
+        /// The Object Lock mode, if any, that's in effect for this object. This header is only
+        /// returned if the requester has the <code>s3:GetObjectRetention</code> permission. For
+        /// more information about S3 Object Lock, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html">Object
+        /// Lock</a>. 
+        /// </para>
+        ///  <note> 
+        /// <para>
+        /// This functionality is not supported for directory buckets.
+        /// </para>
+        ///  </note>
+        /// </summary>
+        public ObjectLockMode ObjectLockMode
+        {
+            get { return this.objectLockMode; }
+            set { this.objectLockMode = value; }
+        }
+
+        // Check to see if ObjectLockMode property is set
+        internal bool IsSetObjectLockMode()
+        {
+            return this.objectLockMode != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property ObjectLockRetainUntilDate. 
+        /// <para>
+        /// The date and time when the Object Lock retention period expires. This header is only
+        /// returned if the requester has the <code>s3:GetObjectRetention</code> permission.
+        /// </para>
+        ///  <note> 
+        /// <para>
+        /// This functionality is not supported for directory buckets.
+        /// </para>
+        ///  </note>
+        /// </summary>
+        public DateTime? ObjectLockRetainUntilDate
+        {
+            get { return this.objectLockRetainUntilDate; }
+            set { this.objectLockRetainUntilDate = value; }
+        }
+
+        // Check to see if ObjectLockRetainUntilDate property is set
+        internal bool IsSetObjectLockRetainUntilDate()
+        {
+            return this.objectLockRetainUntilDate.HasValue; 
+        }
+
+        /// <summary>
+        /// Gets and sets the property StorageClass. 
+        /// <para>
+        /// Provides storage class information of the object. Amazon S3 returns this header for
+        /// all objects except for S3 Standard storage class objects.
+        /// </para>
+        ///  
+        /// <para>
+        /// For more information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html">Storage
+        /// Classes</a>.
+        /// </para>
+        ///  <note> 
+        /// <para>
+        ///  <b>Directory buckets </b> - Only the S3 Express One Zone storage class is supported
+        /// by directory buckets to store objects.
+        /// </para>
+        ///  </note>
+        /// </summary>
+        public S3StorageClass StorageClass
+        {
+            get { return this.storageClass; }
+            set { this.storageClass = value; }
+        }
+
+        // Check to see if StorageClass property is set
+        internal bool IsSetStorageClass()
+        {
+            return this.storageClass != null;
+        }
+
+        /// <summary>
+        /// If present, indicates that the requester was successfully charged for the request.
+        /// </summary>
+        public RequestCharged RequestCharged
+        {
+            get { return this.requestCharged; }
+            set { this.requestCharged = value; }
+        }
+
+        /// <summary>
+        /// Checks to see if RequestCharged is set.
+        /// </summary>
+        /// <returns>true, if RequestCharged property is set.</returns>
+        internal bool IsSetRequestCharged()
+        {
+            return requestCharged != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property BucketKeyEnabled. 
+        /// <para>
+        /// Indicates whether the object uses an S3 Bucket Key for server-side encryption with 
+        /// Key Management Service (KMS) keys (SSE-KMS).
+        /// </para>
+        /// </summary>
+        public bool? BucketKeyEnabled
+        {
+            get { return this.bucketKeyEnabled; }
+            set { this.bucketKeyEnabled = value; }
+        }
+
+        internal bool IsSetBucketKeyEnabled()
+        {
+            return bucketKeyEnabled.HasValue;
+        }
+
+        /// <summary>
+        /// Gets and sets the property ChecksumCRC32. 
+        /// <para>
+        /// The Base64 encoded, 32-bit <c>CRC-32</c> checksum of the object. This checksum is only present
+        /// if the checksum was uploaded with the object. When you use an API operation on an object that
+        /// was uploaded using multipart uploads, this value may not be a direct checksum value
+        /// of the full object. Instead, it's a calculation based on the checksum values of each
+        /// individual part. For more information about how checksums are calculated with multipart
+        /// uploads, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html#large-object-checksums">
+        /// Checking object integrity</a> in the <i>Amazon S3 User Guide</i>.
+        /// </para>
+        /// </summary>
+        public string ChecksumCRC32
+        {
+            get { return this._checksumCRC32; }
+            set { this._checksumCRC32 = value; }
+        }
+
+        // Check to see if ChecksumCRC32 property is set
+        internal bool IsSetChecksumCRC32()
+        {
+            return this._checksumCRC32 != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property ChecksumCRC32C. 
+        /// <para>
+        /// The Base64 encoded, 32-bit <c>CRC-32C</c> checksum of the object. This checksum is only present
+        /// if the checksum was uploaded with the object. When you use an API operation on an object that
+        /// was uploaded using multipart uploads, this value may not be a direct checksum value
+        /// of the full object. Instead, it's a calculation based on the checksum values of each
+        /// individual part. For more information about how checksums are calculated with multipart
+        /// uploads, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html#large-object-checksums">
+        /// Checking object integrity</a> in the <i>Amazon S3 User Guide</i>.
+        /// </para>
+        /// </summary>
+        public string ChecksumCRC32C
+        {
+            get { return this._checksumCRC32C; }
+            set { this._checksumCRC32C = value; }
+        }
+
+        // Check to see if ChecksumCRC32C property is set
+        internal bool IsSetChecksumCRC32C()
+        {
+            return this._checksumCRC32C != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property ChecksumCRC64NVME. 
+        /// <para>
+        /// The Base64 encoded, 64-bit <c>CRC-64NVME</c> checksum of the object. This checksum is only present
+        /// if the checksum was uploaded with the object. When you use an API operation on an object that
+        /// was uploaded using multipart uploads, this value may not be a direct checksum value
+        /// of the full object. Instead, it's a calculation based on the checksum values of each
+        /// individual part. For more information about how checksums are calculated with multipart
+        /// uploads, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html#large-object-checksums">
+        /// Checking object integrity</a> in the <i>Amazon S3 User Guide</i>.
+        /// </para>
+        /// </summary>
+        public string ChecksumCRC64NVME
+        {
+            get { return this._checksumCRC64NVME; }
+            set { this._checksumCRC64NVME = value; }
+        }
+
+        // Check to see if ChecksumCRC64NVME property is set
+        internal bool IsSetChecksumCRC64NVME()
+        {
+            return this._checksumCRC64NVME != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property ChecksumSHA1. 
+        /// <para>
+        /// The Base64 encoded, 160-bit <c>SHA-1</c> digest of the object. This will only be present
+        /// if it was uploaded with the object. When you use the API operation on an object that
+        /// was uploaded using multipart uploads, this value may not be a direct checksum value
+        /// of the full object. Instead, it's a calculation based on the checksum values of each
+        /// individual part. For more information about how checksums are calculated with multipart
+        /// uploads, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html#large-object-checksums">
+        /// Checking object integrity</a> in the <i>Amazon S3 User Guide</i>.
+        /// </para>
+        /// </summary>
+        public string ChecksumSHA1
+        {
+            get { return this._checksumSHA1; }
+            set { this._checksumSHA1 = value; }
+        }
+
+        // Check to see if ChecksumSHA1 property is set
+        internal bool IsSetChecksumSHA1()
+        {
+            return this._checksumSHA1 != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property ChecksumSHA256. 
+        /// <para>
+        /// The Base64 encoded, 256-bit <c>SHA-256</c> digest of the object. This will only be present
+        /// if it was uploaded with the object. When you use an API operation on an object that
+        /// was uploaded using multipart uploads, this value may not be a direct checksum value
+        /// of the full object. Instead, it's a calculation based on the checksum values of each
+        /// individual part. For more information about how checksums are calculated with multipart
+        /// uploads, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html#large-object-checksums">
+        /// Checking object integrity</a> in the <i>Amazon S3 User Guide</i>.
+        /// </para>
+        /// </summary>
+        public string ChecksumSHA256
+        {
+            get { return this._checksumSHA256; }
+            set { this._checksumSHA256 = value; }
+        }
+
+        // Check to see if ChecksumSHA256 property is set
+        internal bool IsSetChecksumSHA256()
+        {
+            return this._checksumSHA256 != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property ChecksumType. 
+        /// <para>
+        /// The checksum type, which determines how part-level checksums are combined to 
+        /// create an object-level checksum for multipart objects. You can use this header 
+        /// response to verify that the checksum type that is received is the same checksum 
+        /// type that was specified in the <c>CreateMultipartUpload</c> request.
+        /// For more information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html">
+        /// Checking object integrity in the Amazon S3 User Guide</a>.
+        /// </para>
+        /// </summary>
+        public ChecksumType ChecksumType
+        {
+            get { return this._checksumType; }
+            set { this._checksumType = value; }
+        }
+
+        // Check to see if ChecksumType property is set
+        internal bool IsSetChecksumType()
+        {
+            return this._checksumType != null;
+        }
     }
 }
 
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectAclRequestMarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectACLRequestMarshaller.cs
similarity index 82%
rename from sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectAclRequestMarshaller.cs
rename to sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectACLRequestMarshaller.cs
index 12b89ec252fa..2d363e36ee65 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectAclRequestMarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectACLRequestMarshaller.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License").
@@ -13,9 +13,6 @@
  * permissions and limitations under the License.
  */
 
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -36,7 +33,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// GetObjectAcl Request Marshaller
     /// </summary>       
-    public partial class GetObjectAclRequestMarshaller : IMarshaller<IRequest, GetObjectAclRequest> , IMarshaller<IRequest,AmazonWebServiceRequest>
+    public class GetObjectAclRequestMarshaller : IMarshaller<IRequest, GetObjectAclRequest>, IMarshaller<IRequest, AmazonWebServiceRequest>
     {
         /// <summary>
         /// Marshaller the request object to the HTTP request.
@@ -58,13 +55,13 @@ public IRequest Marshall(GetObjectAclRequest publicRequest)
             var request = new DefaultRequest(publicRequest, "Amazon.S3");
             request.HttpMethod = "GET";
             request.AddSubResource("acl");
-        
-            if (publicRequest.IsSetExpectedBucketOwner()) 
+
+            if (publicRequest.IsSetExpectedBucketOwner())
             {
                 request.Headers["x-amz-expected-bucket-owner"] = publicRequest.ExpectedBucketOwner;
             }
-        
-            if (publicRequest.IsSetRequestPayer()) 
+
+            if (publicRequest.IsSetRequestPayer())
             {
                 request.Headers["x-amz-request-payer"] = publicRequest.RequestPayer;
             }
@@ -72,17 +69,17 @@ public IRequest Marshall(GetObjectAclRequest publicRequest)
                 throw new AmazonS3Exception("Request object does not have required field BucketName set");
             if (!publicRequest.IsSetKey())
                 throw new AmazonS3Exception("Request object does not have required field Key set");
-            request.AddPathResource("{Key+}", StringUtils.FromString(publicRequest.Key));
-            
+            request.AddPathResource("{Key+}", StringUtils.FromString(publicRequest.Key.TrimStart('/')));
+
             if (publicRequest.IsSetVersionId())
                 request.Parameters.Add("versionId", StringUtils.FromString(publicRequest.VersionId));
             request.ResourcePath = "/{Key+}";
 
-            PostMarshallCustomization(request, publicRequest);
+
             request.UseQueryString = true;
             return request;
         }
-        private static GetObjectAclRequestMarshaller _instance = new GetObjectAclRequestMarshaller();        
+        private static GetObjectAclRequestMarshaller _instance = new GetObjectAclRequestMarshaller();
 
         internal static GetObjectAclRequestMarshaller GetInstance()
         {
@@ -100,6 +97,5 @@ public static GetObjectAclRequestMarshaller Instance
             }
         }
 
-        partial void PostMarshallCustomization(DefaultRequest defaultRequest, GetObjectAclRequest publicRequest);
-    }    
+    }
 }
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectAclResponseUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectACLResponseUnmarshaller.cs
similarity index 69%
rename from sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectAclResponseUnmarshaller.cs
rename to sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectACLResponseUnmarshaller.cs
index d9e2e6ec941d..c8524695c182 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectAclResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectACLResponseUnmarshaller.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License").
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetObjectAcl operation
     /// </summary>  
-    public partial class GetObjectAclResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetObjectAclResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -46,20 +46,27 @@ public partial class GetObjectAclResponseUnmarshaller : S3ReponseUnmarshaller
         public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext context)
         {
             GetObjectAclResponse response = new GetObjectAclResponse();
-            UnmarshallResult(context,response);
+            while (context.Read())
+            {
+                if (context.IsStartElement)
+                {
+                    UnmarshallResult(context, response);
+                    continue;
+                }
+            }
+
             if (context.ResponseData.IsHeaderPresent("x-amz-request-charged"))
                 response.RequestCharged = context.ResponseData.GetHeaderValue("x-amz-request-charged");
-            
-            PostUnmarshallCustomization(context, response);
+
             return response;
-        }        
+        }
 
         private static void UnmarshallResult(XmlUnmarshallerContext context, GetObjectAclResponse response)
         {
             int originalDepth = context.CurrentDepth;
             int targetDepth = originalDepth + 1;
-            if (context.IsStartOfDocument) 
-                   targetDepth += 1;
+            if (context.IsStartOfDocument)
+                targetDepth += 1;
             if (context.IsEmptyResponse)
             {
                 return;
@@ -90,39 +97,12 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetObjectAc
                     return;
                 }
             }
-            return;
-        }
-  
 
-        /// <summary>
-        /// Unmarshaller error response to exception.
-        /// </summary>  
-        /// <param name="context"></param>
-        /// <param name="innerException"></param>
-        /// <param name="statusCode"></param>
-        /// <returns></returns>
-        public override AmazonServiceException UnmarshallException(XmlUnmarshallerContext context, Exception innerException, HttpStatusCode statusCode)
-        {
-            S3ErrorResponse errorResponse = S3ErrorResponseUnmarshaller.Instance.Unmarshall(context);
-            errorResponse.InnerException = innerException;
-            errorResponse.StatusCode = statusCode;
-
-            var responseBodyBytes = context.GetResponseBodyBytes();
-
-            using (var streamCopy = new MemoryStream(responseBodyBytes))
-            using (var contextCopy = new XmlUnmarshallerContext(streamCopy, false, null))
-            {
-                if (errorResponse.Code != null && errorResponse.Code.Equals("NoSuchKey"))
-                {
-                    return NoSuchKeyExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse);
-                }
-            }
-            return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
+            return;
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetObjectAclResponse response);
 
-        private static GetObjectAclResponseUnmarshaller _instance = new GetObjectAclResponseUnmarshaller();        
+        private static GetObjectAclResponseUnmarshaller _instance = new GetObjectAclResponseUnmarshaller();
 
         internal static GetObjectAclResponseUnmarshaller GetInstance()
         {
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectMetadataRequestMarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectMetadataRequestMarshaller.cs
index cdc03bb2f444..c04fdca4c238 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectMetadataRequestMarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectMetadataRequestMarshaller.cs
@@ -23,19 +23,104 @@
 
 namespace Amazon.S3.Model.Internal.MarshallTransformations
 {
-    public partial class GetObjectMetadataRequestMarshaller : IMarshaller<IRequest, GetObjectMetadataRequest> ,IMarshaller<IRequest,Amazon.Runtime.AmazonWebServiceRequest>
+    public class GetObjectMetadataRequestMarshaller : IMarshaller<IRequest, GetObjectMetadataRequest> ,IMarshaller<IRequest,Amazon.Runtime.AmazonWebServiceRequest>
 	{
-        partial void PostMarshallCustomization(DefaultRequest defaultRequest, GetObjectMetadataRequest publicRequest)
+		public IRequest Marshall(Amazon.Runtime.AmazonWebServiceRequest input)
+		{
+			return this.Marshall((GetObjectMetadataRequest)input);
+		}
+
+        public IRequest Marshall(GetObjectMetadataRequest headObjectRequest)
         {
-            if (publicRequest.IsSetServerSideEncryptionCustomerProvidedKey())
+            if (string.IsNullOrEmpty(headObjectRequest.Key))
+                throw new System.ArgumentException("Key is a required property and must be set before making this call.", "GetObjectMetadataRequest.Key");
+
+            IRequest request = new DefaultRequest(headObjectRequest, "AmazonS3");
+
+            request.HttpMethod = "HEAD";
+
+            if(headObjectRequest.IsSetEtagToMatch())
+                request.Headers.Add(HeaderKeys.IfMatchHeader, S3Transforms.ToStringValue(headObjectRequest.EtagToMatch));
+            
+            if(headObjectRequest.IsSetModifiedSinceDate())
+                request.Headers.Add(HeaderKeys.IfModifiedSinceHeader, S3Transforms.ToStringValue(headObjectRequest.ModifiedSinceDate.Value));
+            
+            if(headObjectRequest.IsSetEtagToNotMatch())
+                request.Headers.Add(HeaderKeys.IfNoneMatchHeader, S3Transforms.ToStringValue(headObjectRequest.EtagToNotMatch));
+            
+            if(headObjectRequest.IsSetUnmodifiedSinceDate())
+                request.Headers.Add(HeaderKeys.IfUnmodifiedSinceHeader, S3Transforms.ToStringValue(headObjectRequest.UnmodifiedSinceDate.Value));
+
+            if (headObjectRequest.IsSetServerSideEncryptionCustomerMethod())
+                request.Headers.Add(HeaderKeys.XAmzSSECustomerAlgorithmHeader, headObjectRequest.ServerSideEncryptionCustomerMethod);
+            if (headObjectRequest.IsSetServerSideEncryptionCustomerProvidedKey())
             {
-                defaultRequest.Headers.Add(HeaderKeys.XAmzSSECustomerKeyHeader, publicRequest.ServerSideEncryptionCustomerProvidedKey);
-                if (publicRequest.IsSetServerSideEncryptionCustomerProvidedKeyMD5())
-                    defaultRequest.Headers.Add(HeaderKeys.XAmzSSECustomerKeyMD5Header, publicRequest.ServerSideEncryptionCustomerProvidedKeyMD5);
+                request.Headers.Add(HeaderKeys.XAmzSSECustomerKeyHeader, headObjectRequest.ServerSideEncryptionCustomerProvidedKey);
+                if (headObjectRequest.IsSetServerSideEncryptionCustomerProvidedKeyMD5())
+                    request.Headers.Add(HeaderKeys.XAmzSSECustomerKeyMD5Header, headObjectRequest.ServerSideEncryptionCustomerProvidedKeyMD5);
                 else
-                    defaultRequest.Headers.Add(HeaderKeys.XAmzSSECustomerKeyMD5Header, AmazonS3Util.ComputeEncodedMD5FromEncodedString(publicRequest.ServerSideEncryptionCustomerProvidedKey));
+                    request.Headers.Add(HeaderKeys.XAmzSSECustomerKeyMD5Header, AmazonS3Util.ComputeEncodedMD5FromEncodedString(headObjectRequest.ServerSideEncryptionCustomerProvidedKey));
             }
+            if (headObjectRequest.IsSetRequestPayer())
+                request.Headers.Add(S3Constants.AmzHeaderRequestPayer, S3Transforms.ToStringValue(headObjectRequest.RequestPayer.ToString()));
+
+            if (headObjectRequest.IsSetExpectedBucketOwner())
+                request.Headers.Add(S3Constants.AmzHeaderExpectedBucketOwner, S3Transforms.ToStringValue(headObjectRequest.ExpectedBucketOwner));
+
+            if (headObjectRequest.IsSetChecksumMode())
+                request.Headers.Add(S3Constants.AmzHeaderChecksumMode, S3Transforms.ToStringValue(headObjectRequest.ChecksumMode));
+            if (headObjectRequest.IsSetResponseCacheControl())
+                request.Parameters.Add("response-cache-control", S3Transforms.ToStringValue(headObjectRequest.ResponseCacheControl));
+
+            if (headObjectRequest.IsSetResponseContentDisposition())
+                request.Parameters.Add("response-content-disposition", S3Transforms.ToStringValue(headObjectRequest.ResponseContentDisposition));
+
+            if (headObjectRequest.IsSetResponseContentEncoding())
+                request.Parameters.Add("response-content-encoding", S3Transforms.ToStringValue(headObjectRequest.ResponseContentEncoding));
+
+            if (headObjectRequest.IsSetResponseContentLanguage())
+                request.Parameters.Add("response-content-language", S3Transforms.ToStringValue(headObjectRequest.ResponseContentLanguage));
+
+            if (headObjectRequest.IsSetResponseContentType())
+                request.Parameters.Add("response-content-type", S3Transforms.ToStringValue(headObjectRequest.ResponseContentType));
+
+            if (headObjectRequest.IsSetResponseExpires())
+                request.Parameters.Add("response-expires", S3Transforms.ToStringValue(headObjectRequest.ResponseExpires.Value));
+
+            if (string.IsNullOrEmpty(headObjectRequest.BucketName))
+                throw new System.ArgumentException("BucketName is a required property and must be set before making this call.", "GetObjectMetadataRequest.BucketName");
+            if (string.IsNullOrEmpty(headObjectRequest.Key))
+                throw new System.ArgumentException("Key is a required property and must be set before making this call.", "GetObjectMetadataRequest.Key");
+
+            request.AddPathResource("{Key+}", S3Transforms.ToStringValue(headObjectRequest.Key));
+            request.ResourcePath = "/{Key+}";
+
+            if (headObjectRequest.IsSetVersionId())
+                request.AddSubResource("versionId", S3Transforms.ToStringValue(headObjectRequest.VersionId));
+            if (headObjectRequest.IsSetPartNumber())
+                request.AddSubResource("partNumber", S3Transforms.ToStringValue(headObjectRequest.PartNumber.Value));
+
+            request.UseQueryString = true;
+            
+            return request;
         }
+
+	    private static GetObjectMetadataRequestMarshaller _instance;
+
+        /// <summary>
+        /// Singleton for marshaller
+        /// </summary>
+        public static GetObjectMetadataRequestMarshaller Instance
+	    {
+	        get
+	        {
+	            if (_instance == null)
+	            {
+	                _instance = new GetObjectMetadataRequestMarshaller();
+	            }
+	            return _instance;
+	        }
+	    }
     }
 }
     
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectMetadataResponseUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectMetadataResponseUnmarshaller.cs
index 567b3672ad06..b3bea232b50d 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectMetadataResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectMetadataResponseUnmarshaller.cs
@@ -29,19 +29,36 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     ///    Response Unmarshaller for GetObjectMetadata operation
     /// </summary>
-    public partial class GetObjectMetadataResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetObjectMetadataResponseUnmarshaller : S3ReponseUnmarshaller
     {
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetObjectMetadataResponse response)
+        /// <summary>
+        /// Unmarshaller the response from the service to the response class.
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext context) 
+        {   
+            GetObjectMetadataResponse response = new GetObjectMetadataResponse();
+            
+            UnmarshallResult(context,response);                        
+                 
+                        
+            return response;
+        }
+        
+        private static void UnmarshallResult(XmlUnmarshallerContext context,GetObjectMetadataResponse response)
         {
-            var responseData = context.ResponseData;
-            foreach (var name in responseData.GetHeaderNames())
-            {
-                if (name.StartsWith("x-amz-meta-", StringComparison.OrdinalIgnoreCase))
-                {
-                    response.Metadata[name] = AWSConfigsS3.EnableUnicodeEncodingForObjectMetadata
-                        ? Uri.UnescapeDataString(responseData.GetHeaderValue(name)) : responseData.GetHeaderValue(name);
-                }
-            }
+            
+
+            IWebResponseData responseData = context.ResponseData;
+            if (responseData.IsHeaderPresent("x-amz-delete-marker"))
+                response.DeleteMarker = S3Transforms.ToString(responseData.GetHeaderValue("x-amz-delete-marker"));
+            if (responseData.IsHeaderPresent("accept-ranges"))
+                response.AcceptRanges = S3Transforms.ToString(responseData.GetHeaderValue("accept-ranges"));
+            if (context.ResponseData.IsHeaderPresent("content-range"))
+				response.ContentRange = S3Transforms.ToString(responseData.GetHeaderValue("content-range"));
+            if (responseData.IsHeaderPresent("x-amz-expiration"))
+                response.Expiration = new Expiration(responseData.GetHeaderValue("x-amz-expiration"));
             if (responseData.IsHeaderPresent("x-amz-restore"))
             {
                 bool restoreInProgress;
@@ -51,16 +68,94 @@ partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetObje
                 response.RestoreInProgress = restoreInProgress;
                 response.RestoreExpiration = restoreExpiration;
             }
-            if (responseData.IsHeaderPresent("x-amz-expiration"))
-                response.Expiration = new Expiration(responseData.GetHeaderValue("x-amz-expiration"));
-            if (responseData.IsHeaderPresent("x-amz-delete-marker"))
-                response.DeleteMarker = S3Transforms.ToString(responseData.GetHeaderValue("x-amz-delete-marker"));
+            if (responseData.IsHeaderPresent("Last-Modified"))
+                response.LastModified = S3Transforms.ToDateTime(responseData.GetHeaderValue("Last-Modified"));
+            if (responseData.IsHeaderPresent("ETag"))
+                response.ETag = S3Transforms.ToString(responseData.GetHeaderValue("ETag"));
+            if (responseData.IsHeaderPresent("x-amz-missing-meta"))
+                response.MissingMeta = S3Transforms.ToInt(responseData.GetHeaderValue("x-amz-missing-meta"));
+            if (responseData.IsHeaderPresent("x-amz-version-id"))
+                response.VersionId = S3Transforms.ToString(responseData.GetHeaderValue("x-amz-version-id"));
+            if (responseData.IsHeaderPresent("Cache-Control"))
+                response.Headers.CacheControl = S3Transforms.ToString(responseData.GetHeaderValue("Cache-Control"));
+            if (responseData.IsHeaderPresent("Content-Disposition"))
+                response.Headers.ContentDisposition = S3Transforms.ToString(responseData.GetHeaderValue("Content-Disposition"));
+            if (responseData.IsHeaderPresent("Content-Encoding"))
+                response.Headers.ContentEncoding = S3Transforms.ToString(responseData.GetHeaderValue("Content-Encoding"));
+            if (responseData.IsHeaderPresent("Content-Length"))
+                response.Headers.ContentLength = long.Parse(responseData.GetHeaderValue("Content-Length"), CultureInfo.InvariantCulture);
+            if (responseData.IsHeaderPresent("Content-Type"))
+                response.Headers.ContentType = S3Transforms.ToString(responseData.GetHeaderValue("Content-Type"));
             if (responseData.IsHeaderPresent("Expires"))
                 response.ExpiresString = S3Transforms.ToString(responseData.GetHeaderValue("Expires"));
-            if (responseData.IsHeaderPresent("x-amz-server-side-encryption-customer-algorithm"))
-                response.ServerSideEncryptionCustomerMethod = ServerSideEncryptionCustomerMethod.FindValue(responseData.GetHeaderValue("x-amz-server-side-encryption-customer-algorithm"));
+            if (responseData.IsHeaderPresent("x-amz-website-redirect-location"))
+                response.WebsiteRedirectLocation = S3Transforms.ToString(responseData.GetHeaderValue("x-amz-website-redirect-location"));
             if (responseData.IsHeaderPresent("x-amz-server-side-encryption"))
                 response.ServerSideEncryptionMethod = S3Transforms.ToString(responseData.GetHeaderValue("x-amz-server-side-encryption"));
+            if (responseData.IsHeaderPresent("x-amz-server-side-encryption-customer-algorithm"))
+                response.ServerSideEncryptionCustomerMethod = ServerSideEncryptionCustomerMethod.FindValue(responseData.GetHeaderValue("x-amz-server-side-encryption-customer-algorithm"));
+            if (responseData.IsHeaderPresent(HeaderKeys.XAmzServerSideEncryptionAwsKmsKeyIdHeader))
+                response.ServerSideEncryptionKeyManagementServiceKeyId = S3Transforms.ToString(responseData.GetHeaderValue(HeaderKeys.XAmzServerSideEncryptionAwsKmsKeyIdHeader));
+            if (responseData.IsHeaderPresent("x-amz-replication-status"))
+                response.ReplicationStatus = S3Transforms.ToString(responseData.GetHeaderValue("x-amz-replication-status"));
+            if (responseData.IsHeaderPresent(S3Constants.AmzHeaderMultipartPartsCount))
+                response.PartsCount = S3Transforms.ToInt(responseData.GetHeaderValue(S3Constants.AmzHeaderMultipartPartsCount));
+            if (responseData.IsHeaderPresent(S3Constants.AmzHeaderTaggingCount))
+                response.TagsCount = S3Transforms.ToInt(responseData.GetHeaderValue(S3Constants.AmzHeaderTaggingCount));
+            if (responseData.IsHeaderPresent("x-amz-object-lock-mode"))
+                response.ObjectLockMode = S3Transforms.ToString(responseData.GetHeaderValue("x-amz-object-lock-mode"));
+            if (responseData.IsHeaderPresent("x-amz-object-lock-retain-until-date"))
+                response.ObjectLockRetainUntilDate = S3Transforms.ToDateTime(responseData.GetHeaderValue("x-amz-object-lock-retain-until-date"));
+            if (responseData.IsHeaderPresent("x-amz-object-lock-legal-hold"))
+                response.ObjectLockLegalHoldStatus = S3Transforms.ToString(responseData.GetHeaderValue("x-amz-object-lock-legal-hold"));
+            if (responseData.IsHeaderPresent(HeaderKeys.XAmzStorageClassHeader))
+                response.StorageClass = S3Transforms.ToString(responseData.GetHeaderValue(HeaderKeys.XAmzStorageClassHeader));
+            if (responseData.IsHeaderPresent(S3Constants.AmzHeaderRequestCharged))
+                response.RequestCharged = RequestCharged.FindValue(responseData.GetHeaderValue(S3Constants.AmzHeaderRequestCharged));
+            if (responseData.IsHeaderPresent(S3Constants.AmzHeaderArchiveStatus))
+                response.ArchiveStatus = S3Transforms.ToString(responseData.GetHeaderValue(S3Constants.AmzHeaderArchiveStatus));
+            if (responseData.IsHeaderPresent(S3Constants.AmzHeaderBucketKeyEnabled))
+                response.BucketKeyEnabled = S3Transforms.ToBool(responseData.GetHeaderValue(S3Constants.AmzHeaderBucketKeyEnabled));
+            if (responseData.IsHeaderPresent("x-amz-checksum-crc32"))
+                response.ChecksumCRC32 = S3Transforms.ToString(responseData.GetHeaderValue("x-amz-checksum-crc32"));
+            if (responseData.IsHeaderPresent("x-amz-checksum-crc32c"))
+                response.ChecksumCRC32C = S3Transforms.ToString(responseData.GetHeaderValue("x-amz-checksum-crc32c"));
+            if (responseData.IsHeaderPresent("x-amz-checksum-crc64nvme"))
+                response.ChecksumCRC64NVME = S3Transforms.ToString(responseData.GetHeaderValue("x-amz-checksum-crc64nvme"));
+            if (responseData.IsHeaderPresent("x-amz-checksum-sha1"))
+                response.ChecksumSHA1 = S3Transforms.ToString(responseData.GetHeaderValue("x-amz-checksum-sha1"));
+            if (responseData.IsHeaderPresent("x-amz-checksum-sha256"))
+                response.ChecksumSHA256 = S3Transforms.ToString(responseData.GetHeaderValue("x-amz-checksum-sha256"));
+            if (responseData.IsHeaderPresent(S3Constants.AmzHeaderChecksumType))
+                response.ChecksumType = S3Transforms.ToString(responseData.GetHeaderValue(S3Constants.AmzHeaderChecksumType));
+
+            foreach (var name in responseData.GetHeaderNames())
+            {
+                if (name.StartsWith("x-amz-meta-", StringComparison.OrdinalIgnoreCase))
+                {
+                    response.Metadata[name] = AWSConfigsS3.EnableUnicodeEncodingForObjectMetadata
+                        ? Uri.UnescapeDataString(responseData.GetHeaderValue(name)) : responseData.GetHeaderValue(name);
+                }
+            }
+
+            return;
+        }
+
+        private static GetObjectMetadataResponseUnmarshaller _instance;
+
+        /// <summary>
+        /// Singleton for the unmarshaller
+        /// </summary>
+        public static GetObjectMetadataResponseUnmarshaller Instance
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = new GetObjectMetadataResponseUnmarshaller();
+                }
+                return _instance;
+            }
         }
     }
 }
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListObjectsV2RequestMarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListObjectsV2RequestMarshaller.cs
new file mode 100644
index 000000000000..8b803c1bff9b
--- /dev/null
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListObjectsV2RequestMarshaller.cs
@@ -0,0 +1,93 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ * 
+ *  http://aws.amazon.com/apache2.0
+ * 
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+using Amazon.S3.Util;
+using Amazon.Runtime.Internal;
+using Amazon.Runtime.Internal.Transform;
+using Amazon.Util;
+#pragma warning disable 1591
+
+namespace Amazon.S3.Model.Internal.MarshallTransformations
+{
+    /// <summary>
+    /// List Objects Request Marshaller
+    /// </summary>       
+    public class ListObjectsV2RequestMarshaller : IMarshaller<IRequest, ListObjectsV2Request> ,IMarshaller<IRequest,Amazon.Runtime.AmazonWebServiceRequest>
+	{
+		public IRequest Marshall(Amazon.Runtime.AmazonWebServiceRequest input)
+		{
+            return this.Marshall((ListObjectsV2Request)input);
+		}
+
+        public IRequest Marshall(ListObjectsV2Request listObjectsRequest)
+        {
+            IRequest request = new DefaultRequest(listObjectsRequest, "AmazonS3");
+
+            if (listObjectsRequest.IsSetRequestPayer())
+                request.Headers.Add(S3Constants.AmzHeaderRequestPayer, S3Transforms.ToStringValue(listObjectsRequest.RequestPayer.ToString()));
+
+            if (listObjectsRequest.IsSetExpectedBucketOwner())
+                request.Headers.Add(S3Constants.AmzHeaderExpectedBucketOwner, S3Transforms.ToStringValue(listObjectsRequest.ExpectedBucketOwner));
+
+            if (listObjectsRequest.IsSetOptionalObjectAttributes())
+                request.Headers.Add(S3Constants.AmzOptionalObjectAttributes, AWSSDKUtils.Join(listObjectsRequest.OptionalObjectAttributes));
+            request.HttpMethod = "GET";
+
+            if (string.IsNullOrEmpty(listObjectsRequest.BucketName))
+                throw new System.ArgumentException("BucketName is a required property and must be set before making this call.", "ListObjectsV2Request.BucketName");
+
+            request.ResourcePath = "/";
+
+            if (listObjectsRequest.IsSetDelimiter())
+                request.Parameters.Add("delimiter", S3Transforms.ToStringValue(listObjectsRequest.Delimiter));
+            if (listObjectsRequest.IsSetEncoding())
+                request.Parameters.Add("encoding-type", S3Transforms.ToStringValue(listObjectsRequest.Encoding));
+            if (listObjectsRequest.IsSetMaxKeys())
+                request.Parameters.Add("max-keys", S3Transforms.ToStringValue(listObjectsRequest.MaxKeys.Value));
+            if (listObjectsRequest.IsSetPrefix())
+                request.Parameters.Add("prefix", S3Transforms.ToStringValue(listObjectsRequest.Prefix));
+            if (listObjectsRequest.IsSetContinuationToken())
+                request.Parameters.Add("continuation-token", S3Transforms.ToStringValue(listObjectsRequest.ContinuationToken));
+            if (listObjectsRequest.IsSetFetchOwner())
+                request.Parameters.Add("fetch-owner", S3Transforms.ToStringValue(listObjectsRequest.FetchOwner.Value));
+            if (listObjectsRequest.IsSetStartAfter())
+                request.Parameters.Add("start-after", S3Transforms.ToStringValue(listObjectsRequest.StartAfter));
+
+            request.Parameters.Add("list-type", "2");
+
+            request.UseQueryString = true;
+            
+            return request;
+        }
+
+	    private static ListObjectsV2RequestMarshaller _instance;
+
+        /// <summary>
+        /// Singleton for marshaller
+        /// </summary>
+        public static ListObjectsV2RequestMarshaller Instance
+	    {
+	        get
+	        {
+	            if (_instance == null)
+	            {
+	                _instance = new ListObjectsV2RequestMarshaller();
+	            }
+	            return _instance;
+	        }
+	    }
+    }
+}
+    
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListObjectsV2ResponseUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListObjectsV2ResponseUnmarshaller.cs
index 70944ae89dcc..eebeb7b82ede 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListObjectsV2ResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListObjectsV2ResponseUnmarshaller.cs
@@ -26,21 +26,162 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     ///    Response Unmarshaller for ListObjects operation
     /// </summary>
-    public partial class ListObjectsV2ResponseUnmarshaller : S3ReponseUnmarshaller
+    public class ListObjectsV2ResponseUnmarshaller : S3ReponseUnmarshaller
     {
-        //https://github.com/aws/aws-sdk-net/blob/79cbc392fc3f1c74fcdf34efd77ad681da8af328/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListObjectsV2ResponseUnmarshaller.cs#L75-L87
-        private static void CustomContentsUnmarshall(XmlUnmarshallerContext context, ListObjectsV2Response response)
-        {           
-            // adding the bucket name into the S3Object instance enables
-            // a better pipelining experience in PowerShell
-            if (response.S3Objects == null)
+        /// <summary>
+        /// Unmarshaller the response from the service to the response class.
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext context) 
+        {
+            ListObjectsV2Response response = new ListObjectsV2Response();
+            
+            while (context.Read())
             {
-                response.S3Objects = new List<S3Object>();
+                if (context.IsStartElement)
+                {                    
+                    UnmarshallResult(context,response);                        
+                    continue;
+                }
             }
-            var s3Object = S3ObjectUnmarshaller.Instance.Unmarshall(context);
-            s3Object.BucketName = response.Name;
-            response.S3Objects.Add(s3Object);
 
+            IWebResponseData responseData = context.ResponseData;
+            if (responseData.IsHeaderPresent(S3Constants.AmzHeaderRequestCharged))
+                response.RequestCharged = RequestCharged.FindValue(responseData.GetHeaderValue(S3Constants.AmzHeaderRequestCharged));     
+
+            return response;
+        }
+
+        private static void UnmarshallResult(XmlUnmarshallerContext context, ListObjectsV2Response response)
+        {
+            
+            int originalDepth = context.CurrentDepth;
+            int targetDepth = originalDepth + 1;
+            
+            if (context.IsStartOfDocument) 
+               targetDepth += 2;
+            
+            while (context.Read())
+            {
+                if (context.IsStartElement || context.IsAttribute)
+                {
+                    if (context.TestExpression("IsTruncated", targetDepth))
+                    {
+                        response.IsTruncated = BoolUnmarshaller.GetInstance().Unmarshall(context);
+                            
+                        continue;
+                    }
+                    if (context.TestExpression("Contents", targetDepth))
+                    {
+                        if (response.S3Objects == null)
+                        {
+                            response.S3Objects = new List<S3Object>();
+                        }
+
+                        // adding the bucket name into the S3Object instance enables
+                        // a better pipelining experience in PowerShell
+                        var s3Object = ContentsItemUnmarshaller.Instance.Unmarshall(context);
+                        s3Object.BucketName = response.Name;
+                        response.S3Objects.Add(s3Object);
+                        continue;
+                    }
+                    if (context.TestExpression("Name", targetDepth))
+                    {
+                        response.Name = StringUnmarshaller.GetInstance().Unmarshall(context);
+
+                        continue;
+                    }
+                    if (context.TestExpression("Prefix", targetDepth))
+                    {
+                        response.Prefix = StringUnmarshaller.GetInstance().Unmarshall(context);
+
+                        continue;
+                    }
+                    if (context.TestExpression("Delimiter", targetDepth))
+                    {
+                        response.Delimiter = StringUnmarshaller.GetInstance().Unmarshall(context);
+
+                        continue;
+                    }
+                    if (context.TestExpression("MaxKeys", targetDepth))
+                    {
+                        response.MaxKeys = IntUnmarshaller.GetInstance().Unmarshall(context);
+                            
+                        continue;
+                    }
+                    if (context.TestExpression("CommonPrefixes", targetDepth))
+                    {
+                        var prefix = CommonPrefixesItemUnmarshaller.Instance.Unmarshall(context);
+
+                        if(prefix != null)
+                        {
+                            if (response.CommonPrefixes == null)
+                            {
+                                response.CommonPrefixes = new List<string>();
+                            }
+                            response.CommonPrefixes.Add(prefix);
+                        }
+
+                        continue;
+                    }
+                    if (context.TestExpression("EncodingType", targetDepth))
+                    {
+                        response.Encoding = StringUnmarshaller.GetInstance().Unmarshall(context);
+
+                        continue;
+                    }
+                    if (context.TestExpression("KeyCount", targetDepth))
+                    {
+                        response.KeyCount = IntUnmarshaller.GetInstance().Unmarshall(context);
+
+                        continue;
+                    }
+                    if (context.TestExpression("ContinuationToken", targetDepth))
+                    {
+                        response.ContinuationToken = StringUnmarshaller.GetInstance().Unmarshall(context);
+
+                        continue;
+                    }
+                    if (context.TestExpression("NextContinuationToken", targetDepth))
+                    {
+                        response.NextContinuationToken = StringUnmarshaller.GetInstance().Unmarshall(context);
+
+                        continue;
+                    }
+                    if (context.TestExpression("StartAfter", targetDepth))
+                    {
+                        response.StartAfter = StringUnmarshaller.GetInstance().Unmarshall(context);
+
+                        continue;
+                    }
+                }
+                else if (context.IsEndElement && context.CurrentDepth < originalDepth)
+                {
+                    return;
+                }
+            }
+                            
+
+
+            return;
+        }
+
+        private static ListObjectsV2ResponseUnmarshaller _instance;
+
+        /// <summary>
+        /// Singleton for the unmarshaller
+        /// </summary>
+        public static ListObjectsV2ResponseUnmarshaller Instance
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = new ListObjectsV2ResponseUnmarshaller();
+                }
+                return _instance;
+            }
         }
     }
 }
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListVersionsRequestMarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListVersionsRequestMarshaller.cs
new file mode 100644
index 000000000000..608ae20407fa
--- /dev/null
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListVersionsRequestMarshaller.cs
@@ -0,0 +1,91 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ * 
+ *  http://aws.amazon.com/apache2.0
+ * 
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+using Amazon.Runtime.Internal;
+using Amazon.Runtime.Internal.Transform;
+using Amazon.S3.Util;
+using Amazon.Util;
+#pragma warning disable 1591
+
+namespace Amazon.S3.Model.Internal.MarshallTransformations
+{
+    /// <summary>
+    /// List Object Versions Request Marshaller
+    /// </summary>       
+    public class ListVersionsRequestMarshaller : IMarshaller<IRequest, ListVersionsRequest> ,IMarshaller<IRequest,Amazon.Runtime.AmazonWebServiceRequest>
+	{
+		public IRequest Marshall(Amazon.Runtime.AmazonWebServiceRequest input)
+		{
+			return this.Marshall((ListVersionsRequest)input);
+		}
+
+        public IRequest Marshall(ListVersionsRequest listVersionsRequest)
+        {
+            IRequest request = new DefaultRequest(listVersionsRequest, "AmazonS3");
+
+            request.HttpMethod = "GET";
+
+            if (listVersionsRequest.IsSetExpectedBucketOwner())
+                request.Headers.Add(S3Constants.AmzHeaderExpectedBucketOwner, S3Transforms.ToStringValue(listVersionsRequest.ExpectedBucketOwner));
+
+            if (string.IsNullOrEmpty(listVersionsRequest.BucketName))
+                throw new System.ArgumentException("BucketName is a required property and must be set before making this call.", "ListVersionsRequest.BucketName");
+
+            if (listVersionsRequest.IsSetRequestPayer())
+                request.Headers.Add(S3Constants.AmzHeaderRequestPayer, S3Transforms.ToStringValue(listVersionsRequest.RequestPayer));
+
+            if (listVersionsRequest.IsSetOptionalObjectAttributes())
+                request.Headers.Add(S3Constants.AmzOptionalObjectAttributes, AWSSDKUtils.Join(listVersionsRequest.OptionalObjectAttributes));
+            request.ResourcePath = "/";
+
+            request.AddSubResource("versions");
+
+            if (listVersionsRequest.IsSetDelimiter())
+                request.Parameters.Add("delimiter", S3Transforms.ToStringValue(listVersionsRequest.Delimiter));
+            if (listVersionsRequest.IsSetKeyMarker())
+                request.Parameters.Add("key-marker", S3Transforms.ToStringValue(listVersionsRequest.KeyMarker));
+            if (listVersionsRequest.IsSetMaxKeys())
+                request.Parameters.Add("max-keys", S3Transforms.ToStringValue(listVersionsRequest.MaxKeys.Value));
+            if (listVersionsRequest.IsSetPrefix())
+                request.Parameters.Add("prefix", S3Transforms.ToStringValue(listVersionsRequest.Prefix));
+            if (listVersionsRequest.IsSetVersionIdMarker())
+                request.Parameters.Add("version-id-marker", S3Transforms.ToStringValue(listVersionsRequest.VersionIdMarker));
+            if (listVersionsRequest.IsSetEncoding())
+                request.Parameters.Add("encoding-type", S3Transforms.ToStringValue(listVersionsRequest.Encoding));
+
+            request.UseQueryString = true;
+            
+            return request;
+        }
+
+	    private static ListVersionsRequestMarshaller _instance;
+
+        /// <summary>
+        /// Singleton for marshaller
+        /// </summary>
+        public static ListVersionsRequestMarshaller Instance
+	    {
+	        get
+	        {
+	            if (_instance == null)
+	            {
+	                _instance = new ListVersionsRequestMarshaller();
+	            }
+	            return _instance;
+	        }
+	    }
+    }
+}
+    
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListVersionsResponseUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListVersionsResponseUnmarshaller.cs
index 68793dc9e8eb..5f78072fe5f5 100644
--- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListVersionsResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListVersionsResponseUnmarshaller.cs
@@ -12,49 +12,177 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
+using System;
+using System.Net;
+using System.Collections.Generic;
+using Amazon.S3.Model;
 using Amazon.Runtime;
 using Amazon.Runtime.Internal;
 using Amazon.Runtime.Internal.Transform;
-using Amazon.S3.Model;
 using Amazon.S3.Util;
-using System;
-using System.Collections.Generic;
-using System.Net;
 
 namespace Amazon.S3.Model.Internal.MarshallTransformations
 {
     /// <summary>
     ///    Response Unmarshaller for ListVersions operation
     /// </summary>
-    public partial class ListVersionsResponseUnmarshaller : S3ReponseUnmarshaller
+    public class ListVersionsResponseUnmarshaller : S3ReponseUnmarshaller
     {
-        // https://github.com/aws/aws-sdk-net/blob/79cbc392fc3f1c74fcdf34efd77ad681da8af328/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListVersionsResponseUnmarshaller.cs#L105-L115
-        private static void DeleteItemCustomUnmarshall(XmlUnmarshallerContext context, ListVersionsResponse response)
-        {
-            if (response.Versions == null)
+        /// <summary>
+        /// Unmarshaller the response from the service to the response class.
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext context) 
+        {   
+            ListVersionsResponse response = new ListVersionsResponse();
+            
+            while (context.Read())
             {
-                response.Versions = new List<S3ObjectVersion>();
+                if (context.IsStartElement)
+                {                    
+                    UnmarshallResult(context,response);                        
+                    continue;
+                }
             }
 
-            var version = S3ObjectVersionUnmarshaller.Instance.Unmarshall(context);
-            version.BucketName = response.Name;
-            response.Versions.Add(version);
-            return;
+            IWebResponseData responseData = context.ResponseData;
+            if (responseData.IsHeaderPresent(S3Constants.AmzHeaderRequestCharged))
+                response.RequestCharged = RequestCharged.FindValue(responseData.GetHeaderValue(S3Constants.AmzHeaderRequestCharged));                 
+
+            return response;
         }
-        // https://github.com/aws/aws-sdk-net/blob/79cbc392fc3f1c74fcdf34efd77ad681da8af328/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListVersionsResponseUnmarshaller.cs#L117-L128
-        private static void VersionsItemCustomUnmarshall(XmlUnmarshallerContext context, ListVersionsResponse response)
+        
+        private static void UnmarshallResult(XmlUnmarshallerContext context,ListVersionsResponse response)
         {
-            if (response.Versions == null)
+            
+            int originalDepth = context.CurrentDepth;
+            int targetDepth = originalDepth + 1;
+            
+            if (context.IsStartOfDocument) 
+               targetDepth += 2;
+            
+            while (context.Read())
             {
-                response.Versions = new List<S3ObjectVersion>();
+                if (context.IsStartElement || context.IsAttribute)
+                {
+                    if (context.TestExpression("IsTruncated", targetDepth))
+                    {
+                        response.IsTruncated = BoolUnmarshaller.GetInstance().Unmarshall(context);
+                            
+                        continue;
+                    }
+                    if (context.TestExpression("KeyMarker", targetDepth))
+                    {
+                        response.KeyMarker = StringUnmarshaller.GetInstance().Unmarshall(context);
+                            
+                        continue;
+                    }
+                    if (context.TestExpression("Delimiter", targetDepth))
+                    {
+                        response.Delimiter = StringUnmarshaller.GetInstance().Unmarshall(context);
+
+                        continue;
+                    } 
+                    if (context.TestExpression("VersionIdMarker", targetDepth))
+                    {
+                        response.VersionIdMarker = StringUnmarshaller.GetInstance().Unmarshall(context);
+                            
+                        continue;
+                    }
+                    if (context.TestExpression("NextKeyMarker", targetDepth))
+                    {
+                        response.NextKeyMarker = StringUnmarshaller.GetInstance().Unmarshall(context);
+                            
+                        continue;
+                    }
+                    if (context.TestExpression("NextVersionIdMarker", targetDepth))
+                    {
+                        response.NextVersionIdMarker = StringUnmarshaller.GetInstance().Unmarshall(context);
+                            
+                        continue;
+                    }
+                    if (context.TestExpression("Version", targetDepth))
+                    {
+                        if (response.Versions == null)
+                        {
+                            response.Versions = new List<S3ObjectVersion>();
+                        }
+
+                        var version = VersionsItemUnmarshaller.Instance.Unmarshall(context);
+                        version.BucketName = response.Name;
+                        response.Versions.Add(version);
+                        continue;
+                    }
+                    if (context.TestExpression("DeleteMarker", targetDepth))
+                    {
+                        if (response.Versions == null)
+                        {
+                            response.Versions = new List<S3ObjectVersion>();
+                        }
+
+                        var version = VersionsItemUnmarshaller.Instance.Unmarshall(context);
+                        version.BucketName = response.Name;
+                        version.IsDeleteMarker = true;
+                        response.Versions.Add(version);
+                        continue;
+                    }
+                    if (context.TestExpression("Name", targetDepth))
+                    {
+                        response.Name = StringUnmarshaller.GetInstance().Unmarshall(context);
+                            
+                        continue;
+                    }
+                    if (context.TestExpression("Prefix", targetDepth))
+                    {
+                        response.Prefix = StringUnmarshaller.GetInstance().Unmarshall(context);
+                            
+                        continue;
+                    }
+                    if (context.TestExpression("MaxKeys", targetDepth))
+                    {
+                        response.MaxKeys = IntUnmarshaller.GetInstance().Unmarshall(context);
+                            
+                        continue;
+                    }
+                    if (context.TestExpression("CommonPrefixes", targetDepth))
+                    {
+                        var prefix = CommonPrefixesItemUnmarshaller.Instance.Unmarshall(context);
+
+                        if (prefix != null)
+                            response.CommonPrefixes.Add(prefix);
+                            
+                        continue;
+                    }
+                }
+                else if (context.IsEndElement && context.CurrentDepth < originalDepth)
+                {
+                    return;
+                }
             }
+                            
+
 
-            var version = S3ObjectVersionUnmarshaller.Instance.Unmarshall(context);
-            version.BucketName = response.Name;
-            response.Versions.Add(version);
             return;
         }
 
+        private static ListVersionsResponseUnmarshaller _instance;
+
+        /// <summary>
+        /// Singleton for the unmarshaller
+        /// </summary>
+        public static ListVersionsResponseUnmarshaller Instance
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = new ListVersionsResponseUnmarshaller();
+                }
+                return _instance;
+            }
+        }
+
     }
 }
     
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketAclRequestMarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutBucketACLRequestMarshaller.cs
similarity index 60%
rename from sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketAclRequestMarshaller.cs
rename to sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutBucketACLRequestMarshaller.cs
index 905da432cbd0..f161c9157e9a 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketAclRequestMarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutBucketACLRequestMarshaller.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License").
@@ -29,6 +29,8 @@
 using Amazon.Runtime.Internal.Transform;
 using Amazon.Runtime.Internal.Util;
 using System.Xml;
+using Amazon.Util;
+using Amazon.S3.Util;
 
 #pragma warning disable CS0612,CS0618
 namespace Amazon.S3.Model.Internal.MarshallTransformations
@@ -36,7 +38,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// PutBucketAcl Request Marshaller
     /// </summary>       
-    public partial class PutBucketAclRequestMarshaller : IMarshaller<IRequest, PutBucketAclRequest> , IMarshaller<IRequest,AmazonWebServiceRequest>
+    public class PutBucketAclRequestMarshaller : IMarshaller<IRequest, PutBucketAclRequest>, IMarshaller<IRequest, AmazonWebServiceRequest>
     {
         /// <summary>
         /// Marshaller the request object to the HTTP request.
@@ -58,126 +60,132 @@ public IRequest Marshall(PutBucketAclRequest publicRequest)
             var request = new DefaultRequest(publicRequest, "Amazon.S3");
             request.HttpMethod = "PUT";
             request.AddSubResource("acl");
-        
-            if (publicRequest.IsSetACL()) 
+
+            if (publicRequest.IsSetACL())
             {
                 request.Headers["x-amz-acl"] = publicRequest.ACL;
             }
-        
-            if (publicRequest.IsSetChecksumAlgorithm()) 
+
+            if (publicRequest.IsSetChecksumAlgorithm())
             {
                 request.Headers["x-amz-sdk-checksum-algorithm"] = publicRequest.ChecksumAlgorithm;
             }
-        
-            if (publicRequest.IsSetContentMD5()) 
+
+            if (publicRequest.IsSetContentMD5())
             {
                 request.Headers["Content-MD5"] = publicRequest.ContentMD5;
             }
-        
-            if (publicRequest.IsSetExpectedBucketOwner()) 
+
+            if (publicRequest.IsSetExpectedBucketOwner())
             {
                 request.Headers["x-amz-expected-bucket-owner"] = publicRequest.ExpectedBucketOwner;
             }
-        
-            if (publicRequest.IsSetGrantFullControl()) 
+
+            if (publicRequest.IsSetGrantFullControl())
             {
                 request.Headers["x-amz-grant-full-control"] = publicRequest.GrantFullControl;
             }
-        
-            if (publicRequest.IsSetGrantRead()) 
+
+            if (publicRequest.IsSetGrantRead())
             {
                 request.Headers["x-amz-grant-read"] = publicRequest.GrantRead;
             }
-        
-            if (publicRequest.IsSetGrantReadACP()) 
+
+            if (publicRequest.IsSetGrantReadACP())
             {
                 request.Headers["x-amz-grant-read-acp"] = publicRequest.GrantReadACP;
             }
-        
-            if (publicRequest.IsSetGrantWrite()) 
+
+            if (publicRequest.IsSetGrantWrite())
             {
                 request.Headers["x-amz-grant-write"] = publicRequest.GrantWrite;
             }
-        
-            if (publicRequest.IsSetGrantWriteACP()) 
+
+            if (publicRequest.IsSetGrantWriteACP())
             {
                 request.Headers["x-amz-grant-write-acp"] = publicRequest.GrantWriteACP;
             }
             if (!publicRequest.IsSetBucketName())
                 throw new AmazonS3Exception("Request object does not have required field BucketName set");
-            request.ResourcePath = "/";
+
             var stringWriter = new XMLEncodedStringWriter(CultureInfo.InvariantCulture);
             using (var xmlWriter = XmlWriter.Create(stringWriter, new XmlWriterSettings() { Encoding = System.Text.Encoding.UTF8, OmitXmlDeclaration = true, NewLineHandling = NewLineHandling.Entitize }))
-            {   
+            {
                 if (publicRequest.IsSetAccessControlPolicy())
                 {
-                    xmlWriter.WriteStartElement("AccessControlPolicy", "http://s3.amazonaws.com/doc/2006-03-01/");
+                    xmlWriter.WriteStartElement("AccessControlPolicy", S3Constants.S3RequestXmlNamespace);
                     var publicRequestAccessControlPolicyGrants = publicRequest.AccessControlPolicy.Grants;
-                    if (publicRequestAccessControlPolicyGrants != null && (publicRequestAccessControlPolicyGrants.Count > 0 || !AWSConfigs.InitializeCollections)) 
+                    if (publicRequestAccessControlPolicyGrants != null && (publicRequestAccessControlPolicyGrants.Count > 0 || !AWSConfigs.InitializeCollections))
                     {
                         xmlWriter.WriteStartElement("AccessControlList");
-                        foreach (var publicRequestAccessControlPolicyGrantsValue in publicRequestAccessControlPolicyGrants) 
-                        {
-                        if (publicRequestAccessControlPolicyGrantsValue != null)
+                        foreach (var publicRequestAccessControlPolicyGrantsValue in publicRequestAccessControlPolicyGrants)
                         {
                             xmlWriter.WriteStartElement("Grant");
-                            if (publicRequestAccessControlPolicyGrantsValue.Grantee != null)
+                            if (publicRequestAccessControlPolicyGrantsValue != null)
                             {
-                                xmlWriter.WriteStartElement("xsi","Grantee","http://www.w3.org/2001/XMLSchema-instance");
-                                if(publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetCanonicalUser())
-                                    xmlWriter.WriteElementString("ID", StringUtils.FromString(publicRequestAccessControlPolicyGrantsValue.Grantee.CanonicalUser));
-                                if(publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetDisplayName())
-                                    xmlWriter.WriteElementString("DisplayName", StringUtils.FromString(publicRequestAccessControlPolicyGrantsValue.Grantee.DisplayName));
-                                if(publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetEmailAddress())
-                                    xmlWriter.WriteElementString("EmailAddress", StringUtils.FromString(publicRequestAccessControlPolicyGrantsValue.Grantee.EmailAddress));
-                                if(publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetType())
-                                    xmlWriter.WriteAttributeString("xsi","type", "http://www.w3.org/2001/XMLSchema-instance",StringUtils.FromString(publicRequestAccessControlPolicyGrantsValue.Grantee.Type));
-                                if(publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetURI())
-                                    xmlWriter.WriteElementString("URI", StringUtils.FromString(publicRequestAccessControlPolicyGrantsValue.Grantee.URI));
+                                if (publicRequestAccessControlPolicyGrantsValue.Grantee != null)
+                                {
+                                    xmlWriter.WriteStartElement( "xsi","Grantee", "http://www.w3.org/2001/XMLSchema-instance");
+                                    if (publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetType())
+                                        xmlWriter.WriteAttributeString("xsi", "type", "http://www.w3.org/2001/XMLSchema-instance", S3Transforms.ToXmlStringValue(publicRequestAccessControlPolicyGrantsValue.Grantee.Type));
+                                    if (publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetDisplayName())
+                                        xmlWriter.WriteElementString("DisplayName",S3Transforms.ToXmlStringValue(publicRequestAccessControlPolicyGrantsValue.Grantee.DisplayName));
+
+                                    if (publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetEmailAddress())
+                                        xmlWriter.WriteElementString("EmailAddress", S3Transforms.ToXmlStringValue(publicRequestAccessControlPolicyGrantsValue.Grantee.EmailAddress));
+
+                                    if (publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetCanonicalUser())
+                                        xmlWriter.WriteElementString("ID", S3Transforms.ToXmlStringValue(publicRequestAccessControlPolicyGrantsValue.Grantee.CanonicalUser));
+
+                                    if (publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetURI())
+                                        xmlWriter.WriteElementString("URI", S3Transforms.ToXmlStringValue(publicRequestAccessControlPolicyGrantsValue.Grantee.URI));
+                                    xmlWriter.WriteEndElement();
+                                }
+                                if (publicRequestAccessControlPolicyGrantsValue.IsSetPermission())
+                                    xmlWriter.WriteElementString("Permission", S3Transforms.ToXmlStringValue(publicRequestAccessControlPolicyGrantsValue.Permission));
+
                                 xmlWriter.WriteEndElement();
                             }
-                            if(publicRequestAccessControlPolicyGrantsValue.IsSetPermission())
-                                xmlWriter.WriteElementString("Permission", StringUtils.FromString(publicRequestAccessControlPolicyGrantsValue.Permission));
-                            xmlWriter.WriteEndElement();
                         }
-                        }            
-                        xmlWriter.WriteEndElement();            
+                        xmlWriter.WriteEndElement();
                     }
                     if (publicRequest.AccessControlPolicy.Owner != null)
                     {
                         xmlWriter.WriteStartElement("Owner");
-                        if(publicRequest.AccessControlPolicy.Owner.IsSetDisplayName())
-                            xmlWriter.WriteElementString("DisplayName", StringUtils.FromString(publicRequest.AccessControlPolicy.Owner.DisplayName));
-                        if(publicRequest.AccessControlPolicy.Owner.IsSetId())
-                            xmlWriter.WriteElementString("ID", StringUtils.FromString(publicRequest.AccessControlPolicy.Owner.Id));
+                        if (publicRequest.AccessControlPolicy.Owner.IsSetDisplayName())
+                            xmlWriter.WriteElementString("DisplayName", S3Transforms.ToXmlStringValue(publicRequest.AccessControlPolicy.Owner.DisplayName));
+
+                        if (publicRequest.AccessControlPolicy.Owner.IsSetId())
+                            xmlWriter.WriteElementString("ID", S3Transforms.ToXmlStringValue(publicRequest.AccessControlPolicy.Owner.Id));
+
                         xmlWriter.WriteEndElement();
                     }
 
                     xmlWriter.WriteEndElement();
                 }
             }
-            PostMarshallCustomization(request, publicRequest);
-            try 
+            try
             {
                 string content = stringWriter.ToString();
-                request.Content = System.Text.Encoding.UTF8.GetBytes(content);
-                request.Headers["Content-Type"] = "application/xml";
+                request.Content = Encoding.UTF8.GetBytes(content);
+                request.Headers[HeaderKeys.ContentTypeHeader] = "application/xml";
+
                 ChecksumUtils.SetChecksumData(
                     request,
                     publicRequest.ChecksumAlgorithm,
                     fallbackToMD5: false,
                     isRequestChecksumRequired: true,
-                    headerName: "x-amz-sdk-checksum-algorithm"
+                    headerName: S3Constants.AmzHeaderSdkChecksumAlgorithm
                 );
-                request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2006-03-01";            
-            } 
-            catch (EncoderFallbackException e) 
+            }
+            catch (EncoderFallbackException e)
             {
                 throw new AmazonServiceException("Unable to marshall request to XML", e);
             }
+
             return request;
         }
-        private static PutBucketAclRequestMarshaller _instance = new PutBucketAclRequestMarshaller();        
+        private static PutBucketAclRequestMarshaller _instance = new PutBucketAclRequestMarshaller();
 
         internal static PutBucketAclRequestMarshaller GetInstance()
         {
@@ -195,6 +203,5 @@ public static PutBucketAclRequestMarshaller Instance
             }
         }
 
-        partial void PostMarshallCustomization(DefaultRequest defaultRequest, PutBucketAclRequest publicRequest);
-    }    
+    }
 }
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketAclResponseUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutBucketACLResponseUnmarshaller.cs
similarity index 60%
rename from sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketAclResponseUnmarshaller.cs
rename to sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutBucketACLResponseUnmarshaller.cs
index f3d2990e205d..fc4bd18f4e0a 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketAclResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutBucketACLResponseUnmarshaller.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License").
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for PutBucketAcl operation
     /// </summary>  
-    public partial class PutBucketAclResponseUnmarshaller : S3ReponseUnmarshaller
+    public class PutBucketAclResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -46,37 +46,11 @@ public partial class PutBucketAclResponseUnmarshaller : S3ReponseUnmarshaller
         public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext context)
         {
             PutBucketAclResponse response = new PutBucketAclResponse();
-            
-            PostUnmarshallCustomization(context, response);
-            return response;
-        }        
-  
 
-        /// <summary>
-        /// Unmarshaller error response to exception.
-        /// </summary>  
-        /// <param name="context"></param>
-        /// <param name="innerException"></param>
-        /// <param name="statusCode"></param>
-        /// <returns></returns>
-        public override AmazonServiceException UnmarshallException(XmlUnmarshallerContext context, Exception innerException, HttpStatusCode statusCode)
-        {
-            S3ErrorResponse errorResponse = S3ErrorResponseUnmarshaller.Instance.Unmarshall(context);
-            errorResponse.InnerException = innerException;
-            errorResponse.StatusCode = statusCode;
-
-            var responseBodyBytes = context.GetResponseBodyBytes();
-
-            using (var streamCopy = new MemoryStream(responseBodyBytes))
-            using (var contextCopy = new XmlUnmarshallerContext(streamCopy, false, null))
-            {
-            }
-            return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
+            return response;
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, PutBucketAclResponse response);
-
-        private static PutBucketAclResponseUnmarshaller _instance = new PutBucketAclResponseUnmarshaller();        
+        private static PutBucketAclResponseUnmarshaller _instance = new PutBucketAclResponseUnmarshaller();
 
         internal static PutBucketAclResponseUnmarshaller GetInstance()
         {
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutCORSConfigurationRequestMarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutCORSConfigurationRequestMarshaller.cs
new file mode 100644
index 000000000000..f16c57937197
--- /dev/null
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutCORSConfigurationRequestMarshaller.cs
@@ -0,0 +1,191 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ * 
+ *  http://aws.amazon.com/apache2.0
+ * 
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+using System.IO;
+using System.Xml;
+using System.Text;
+using Amazon.S3.Util;
+using Amazon.Runtime;
+using Amazon.Runtime.Internal;
+using Amazon.Runtime.Internal.Transform;
+using Amazon.Util;
+using Amazon.Runtime.Internal.Util;
+
+#pragma warning disable 1591
+
+namespace Amazon.S3.Model.Internal.MarshallTransformations
+{
+    /// <summary>
+    /// Put Bucket Cors Request Marshaller
+    /// </summary>       
+    public class PutCORSConfigurationRequestMarshaller : IMarshaller<IRequest, PutCORSConfigurationRequest> ,IMarshaller<IRequest,Amazon.Runtime.AmazonWebServiceRequest>
+	{
+		public IRequest Marshall(Amazon.Runtime.AmazonWebServiceRequest input)
+		{
+			return this.Marshall((PutCORSConfigurationRequest)input);
+		}
+
+        public IRequest Marshall(PutCORSConfigurationRequest putCORSConfigurationRequest)
+        {
+            IRequest request = new DefaultRequest(putCORSConfigurationRequest, "AmazonS3");
+
+            request.HttpMethod = "PUT";
+
+            if (putCORSConfigurationRequest.IsSetChecksumAlgorithm())
+                request.Headers.Add(S3Constants.AmzHeaderSdkChecksumAlgorithm, S3Transforms.ToStringValue(putCORSConfigurationRequest.ChecksumAlgorithm));
+
+            if (putCORSConfigurationRequest.IsSetExpectedBucketOwner())
+                request.Headers.Add(S3Constants.AmzHeaderExpectedBucketOwner, S3Transforms.ToStringValue(putCORSConfigurationRequest.ExpectedBucketOwner));
+
+            if (string.IsNullOrEmpty(putCORSConfigurationRequest.BucketName))
+                throw new System.ArgumentException("BucketName is a required property and must be set before making this call.", "PutCORSConfigurationRequest.BucketName");
+
+            request.ResourcePath = "/";
+
+            request.AddSubResource("cors");
+
+            var stringWriter = new XMLEncodedStringWriter(System.Globalization.CultureInfo.InvariantCulture);
+            using (var xmlWriter = XmlWriter.Create(stringWriter, new XmlWriterSettings() { Encoding = Encoding.UTF8, OmitXmlDeclaration = true, NewLineHandling = NewLineHandling.Entitize }))
+            {
+                var configuration = putCORSConfigurationRequest.Configuration;
+                if (configuration != null)
+                {
+                    xmlWriter.WriteStartElement("CORSConfiguration", S3Constants.S3RequestXmlNamespace);
+
+                    if (configuration != null)
+                    {
+                        var cORSConfigurationCORSConfigurationcORSRulesList = configuration.Rules;
+                        if (cORSConfigurationCORSConfigurationcORSRulesList != null && cORSConfigurationCORSConfigurationcORSRulesList.Count > 0)
+                        {
+                            foreach (var cORSConfigurationCORSConfigurationcORSRulesListValue in cORSConfigurationCORSConfigurationcORSRulesList)
+                            {
+                                xmlWriter.WriteStartElement("CORSRule");
+
+                                if (cORSConfigurationCORSConfigurationcORSRulesListValue != null)
+                                {
+                                    var cORSRuleMemberallowedMethodsList = cORSConfigurationCORSConfigurationcORSRulesListValue.AllowedMethods;
+                                    if (cORSRuleMemberallowedMethodsList != null && cORSRuleMemberallowedMethodsList.Count > 0)
+                                    {
+                                        foreach (string cORSRuleMemberallowedMethodsListValue in cORSRuleMemberallowedMethodsList)
+                                        {
+                                            xmlWriter.WriteStartElement("AllowedMethod");
+                                            xmlWriter.WriteValue(cORSRuleMemberallowedMethodsListValue);
+                                            xmlWriter.WriteEndElement();
+                                        }
+                                    }
+                                }
+
+                                if (cORSConfigurationCORSConfigurationcORSRulesListValue != null)
+                                {
+                                    var cORSRuleMemberallowedOriginsList = cORSConfigurationCORSConfigurationcORSRulesListValue.AllowedOrigins;
+                                    if (cORSRuleMemberallowedOriginsList != null && cORSRuleMemberallowedOriginsList.Count > 0)
+                                    {
+                                        foreach (string cORSRuleMemberallowedOriginsListValue in cORSRuleMemberallowedOriginsList)
+                                        {
+                                            xmlWriter.WriteStartElement("AllowedOrigin");
+                                            xmlWriter.WriteValue(cORSRuleMemberallowedOriginsListValue);
+                                            xmlWriter.WriteEndElement();
+                                        }
+                                    }
+                                }
+
+                                if (cORSConfigurationCORSConfigurationcORSRulesListValue != null)
+                                {
+                                    var cORSRuleMemberexposeHeadersList = cORSConfigurationCORSConfigurationcORSRulesListValue.ExposeHeaders;
+                                    if (cORSRuleMemberexposeHeadersList != null && cORSRuleMemberexposeHeadersList.Count > 0)
+                                    {
+                                        foreach (string cORSRuleMemberexposeHeadersListValue in cORSRuleMemberexposeHeadersList)
+                                        {
+                                            xmlWriter.WriteStartElement("ExposeHeader");
+                                            xmlWriter.WriteValue(cORSRuleMemberexposeHeadersListValue);
+                                            xmlWriter.WriteEndElement();
+                                        }
+                                    }
+                                }
+
+                                if (cORSConfigurationCORSConfigurationcORSRulesListValue != null)
+                                {
+                                    var cORSRuleMemberallowedHeadersList = cORSConfigurationCORSConfigurationcORSRulesListValue.AllowedHeaders;
+                                    if (cORSRuleMemberallowedHeadersList != null && cORSRuleMemberallowedHeadersList.Count > 0)
+                                    {
+                                        foreach (string cORSRuleMemberallowedHeadersListValue in cORSRuleMemberallowedHeadersList)
+                                        {
+                                            xmlWriter.WriteStartElement("AllowedHeader");
+                                            xmlWriter.WriteValue(cORSRuleMemberallowedHeadersListValue);
+                                            xmlWriter.WriteEndElement();
+                                        }
+                                    }
+                                }
+
+                                if (cORSConfigurationCORSConfigurationcORSRulesListValue.IsSetMaxAgeSeconds())
+                                {
+                                    xmlWriter.WriteElementString("MaxAgeSeconds", S3Transforms.ToXmlStringValue(cORSConfigurationCORSConfigurationcORSRulesListValue.MaxAgeSeconds.Value));
+                                }
+
+                                if (cORSConfigurationCORSConfigurationcORSRulesListValue.IsSetId())
+                                {
+                                    xmlWriter.WriteElementString("ID", S3Transforms.ToXmlStringValue(cORSConfigurationCORSConfigurationcORSRulesListValue.Id));
+                                }
+
+                                xmlWriter.WriteEndElement();
+                            }
+                        }
+                    }
+                    xmlWriter.WriteEndElement();
+                }
+            }
+
+
+            try
+            {
+                var content = stringWriter.ToString();
+                request.Content = Encoding.UTF8.GetBytes(content);
+                request.Headers[HeaderKeys.ContentTypeHeader] = "application/xml";
+
+                ChecksumUtils.SetChecksumData(
+                    request, 
+                    putCORSConfigurationRequest.ChecksumAlgorithm, 
+                    fallbackToMD5: false, 
+                    isRequestChecksumRequired: true,
+                    headerName: S3Constants.AmzHeaderSdkChecksumAlgorithm
+                );
+            }
+            catch (EncoderFallbackException e)
+            {
+                throw new AmazonServiceException("Unable to marshall request to XML", e);
+            }
+
+            return request;
+        }
+
+	    private static PutCORSConfigurationRequestMarshaller _instance;
+
+        /// <summary>
+        /// Singleton for marshaller
+        /// </summary>
+        public static PutCORSConfigurationRequestMarshaller Instance
+	    {
+	        get
+	        {
+	            if (_instance == null)
+	            {
+	                _instance = new PutCORSConfigurationRequestMarshaller();
+	            }
+	            return _instance;
+	        }
+	    }
+    }
+}
+
diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutCORSConfigurationResponseUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutCORSConfigurationResponseUnmarshaller.cs
new file mode 100644
index 000000000000..e18cd0932dee
--- /dev/null
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutCORSConfigurationResponseUnmarshaller.cs
@@ -0,0 +1,62 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ * 
+ *  http://aws.amazon.com/apache2.0
+ * 
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+using System;
+using System.Net;
+using System.Collections.Generic;
+using Amazon.S3.Model;
+using Amazon.Runtime;
+using Amazon.Runtime.Internal;
+using Amazon.Runtime.Internal.Transform;
+
+namespace Amazon.S3.Model.Internal.MarshallTransformations
+{
+    /// <summary>
+    ///    Response Unmarshaller for PutCORSConfiguration operation
+    /// </summary>
+    public class PutCORSConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
+    {
+        /// <summary>
+        /// Unmarshaller the response from the service to the response class.
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext context) 
+        {
+            PutCORSConfigurationResponse response = new PutCORSConfigurationResponse();
+            
+
+            return response;
+        }
+
+        private static PutCORSConfigurationResponseUnmarshaller _instance;
+
+        /// <summary>
+        /// Singleton for the unmarshaller
+        /// </summary>
+        public static PutCORSConfigurationResponseUnmarshaller Instance
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = new PutCORSConfigurationResponseUnmarshaller();
+                }
+                return _instance;
+            }
+        }
+    
+    }
+}
+    
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectAclRequestMarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutObjectACLRequestMarshaller.cs
similarity index 64%
rename from sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectAclRequestMarshaller.cs
rename to sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutObjectACLRequestMarshaller.cs
index 55184abe0b84..48db908234d1 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectAclRequestMarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutObjectACLRequestMarshaller.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License").
@@ -29,6 +29,7 @@
 using Amazon.Runtime.Internal.Transform;
 using Amazon.Runtime.Internal.Util;
 using System.Xml;
+using Amazon.S3.Util;
 
 #pragma warning disable CS0612,CS0618
 namespace Amazon.S3.Model.Internal.MarshallTransformations
@@ -36,7 +37,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// PutObjectAcl Request Marshaller
     /// </summary>       
-    public partial class PutObjectAclRequestMarshaller : IMarshaller<IRequest, PutObjectAclRequest> , IMarshaller<IRequest,AmazonWebServiceRequest>
+    public class PutObjectAclRequestMarshaller : IMarshaller<IRequest, PutObjectAclRequest>, IMarshaller<IRequest, AmazonWebServiceRequest>
     {
         /// <summary>
         /// Marshaller the request object to the HTTP request.
@@ -58,53 +59,53 @@ public IRequest Marshall(PutObjectAclRequest publicRequest)
             var request = new DefaultRequest(publicRequest, "Amazon.S3");
             request.HttpMethod = "PUT";
             request.AddSubResource("acl");
-        
-            if (publicRequest.IsSetACL()) 
+
+            if (publicRequest.IsSetACL())
             {
                 request.Headers["x-amz-acl"] = publicRequest.ACL;
             }
-        
-            if (publicRequest.IsSetChecksumAlgorithm()) 
+
+            if (publicRequest.IsSetChecksumAlgorithm())
             {
                 request.Headers["x-amz-sdk-checksum-algorithm"] = publicRequest.ChecksumAlgorithm;
             }
-        
-            if (publicRequest.IsSetContentMD5()) 
+
+            if (publicRequest.IsSetContentMD5())
             {
                 request.Headers["Content-MD5"] = publicRequest.ContentMD5;
             }
-        
-            if (publicRequest.IsSetExpectedBucketOwner()) 
+
+            if (publicRequest.IsSetExpectedBucketOwner())
             {
                 request.Headers["x-amz-expected-bucket-owner"] = publicRequest.ExpectedBucketOwner;
             }
-        
-            if (publicRequest.IsSetGrantFullControl()) 
+
+            if (publicRequest.IsSetGrantFullControl())
             {
                 request.Headers["x-amz-grant-full-control"] = publicRequest.GrantFullControl;
             }
-        
-            if (publicRequest.IsSetGrantRead()) 
+
+            if (publicRequest.IsSetGrantRead())
             {
                 request.Headers["x-amz-grant-read"] = publicRequest.GrantRead;
             }
-        
-            if (publicRequest.IsSetGrantReadACP()) 
+
+            if (publicRequest.IsSetGrantReadACP())
             {
                 request.Headers["x-amz-grant-read-acp"] = publicRequest.GrantReadACP;
             }
-        
-            if (publicRequest.IsSetGrantWrite()) 
+
+            if (publicRequest.IsSetGrantWrite())
             {
                 request.Headers["x-amz-grant-write"] = publicRequest.GrantWrite;
             }
-        
-            if (publicRequest.IsSetGrantWriteACP()) 
+
+            if (publicRequest.IsSetGrantWriteACP())
             {
                 request.Headers["x-amz-grant-write-acp"] = publicRequest.GrantWriteACP;
             }
-        
-            if (publicRequest.IsSetRequestPayer()) 
+
+            if (publicRequest.IsSetRequestPayer())
             {
                 request.Headers["x-amz-request-payer"] = publicRequest.RequestPayer;
             }
@@ -113,83 +114,87 @@ public IRequest Marshall(PutObjectAclRequest publicRequest)
             if (!publicRequest.IsSetKey())
                 throw new AmazonS3Exception("Request object does not have required field Key set");
             request.AddPathResource("{Key+}", StringUtils.FromString(publicRequest.Key));
-            
+
             if (publicRequest.IsSetVersionId())
                 request.Parameters.Add("versionId", StringUtils.FromString(publicRequest.VersionId));
             request.ResourcePath = "/{Key+}";
+
             var stringWriter = new XMLEncodedStringWriter(CultureInfo.InvariantCulture);
             using (var xmlWriter = XmlWriter.Create(stringWriter, new XmlWriterSettings() { Encoding = System.Text.Encoding.UTF8, OmitXmlDeclaration = true, NewLineHandling = NewLineHandling.Entitize }))
-            {   
+            {
                 if (publicRequest.IsSetAccessControlPolicy())
                 {
-                    xmlWriter.WriteStartElement("AccessControlPolicy", "http://s3.amazonaws.com/doc/2006-03-01/");
+                    xmlWriter.WriteStartElement("AccessControlPolicy", S3Constants.S3RequestXmlNamespace);
                     var publicRequestAccessControlPolicyGrants = publicRequest.AccessControlPolicy.Grants;
-                    if (publicRequestAccessControlPolicyGrants != null && (publicRequestAccessControlPolicyGrants.Count > 0 || !AWSConfigs.InitializeCollections)) 
+                    if (publicRequestAccessControlPolicyGrants != null && (publicRequestAccessControlPolicyGrants.Count > 0 || !AWSConfigs.InitializeCollections))
                     {
                         xmlWriter.WriteStartElement("AccessControlList");
-                        foreach (var publicRequestAccessControlPolicyGrantsValue in publicRequestAccessControlPolicyGrants) 
+                        foreach (var publicRequestAccessControlPolicyGrantsValue in publicRequestAccessControlPolicyGrants)
                         {
-                        if (publicRequestAccessControlPolicyGrantsValue != null)
-                        {
-                            xmlWriter.WriteStartElement("Grant");
-                            if (publicRequestAccessControlPolicyGrantsValue.Grantee != null)
+                            if (publicRequestAccessControlPolicyGrantsValue != null)
                             {
-                                xmlWriter.WriteStartElement("xsi","Grantee","http://www.w3.org/2001/XMLSchema-instance");
-                                if(publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetCanonicalUser())
-                                    xmlWriter.WriteElementString("ID", StringUtils.FromString(publicRequestAccessControlPolicyGrantsValue.Grantee.CanonicalUser));
-                                if(publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetDisplayName())
-                                    xmlWriter.WriteElementString("DisplayName", StringUtils.FromString(publicRequestAccessControlPolicyGrantsValue.Grantee.DisplayName));
-                                if(publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetEmailAddress())
-                                    xmlWriter.WriteElementString("EmailAddress", StringUtils.FromString(publicRequestAccessControlPolicyGrantsValue.Grantee.EmailAddress));
-                                if(publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetType())
-                                    xmlWriter.WriteAttributeString("xsi","type", "http://www.w3.org/2001/XMLSchema-instance",StringUtils.FromString(publicRequestAccessControlPolicyGrantsValue.Grantee.Type));
-                                if(publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetURI())
-                                    xmlWriter.WriteElementString("URI", StringUtils.FromString(publicRequestAccessControlPolicyGrantsValue.Grantee.URI));
+                                xmlWriter.WriteStartElement("Grant");
+                                if (publicRequestAccessControlPolicyGrantsValue.Grantee != null)
+                                {
+                                    xmlWriter.WriteStartElement("xsi","Grantee", "http://www.w3.org/2001/XMLSchema-instance");
+                                    if (publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetType())
+                                        xmlWriter.WriteAttributeString("xsi", "type", "http://www.w3.org/2001/XMLSchema-instance", S3Transforms.ToXmlStringValue(publicRequestAccessControlPolicyGrantsValue.Grantee.Type));
+                                    if (publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetDisplayName())
+                                        xmlWriter.WriteElementString("DisplayName", S3Transforms.ToXmlStringValue(publicRequestAccessControlPolicyGrantsValue.Grantee.DisplayName));
+                                    if (publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetEmailAddress())
+                                        xmlWriter.WriteElementString("EmailAddress", S3Transforms.ToXmlStringValue(publicRequestAccessControlPolicyGrantsValue.Grantee.EmailAddress));
+                                    if (publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetCanonicalUser())
+                                        xmlWriter.WriteElementString("ID", S3Transforms.ToXmlStringValue(publicRequestAccessControlPolicyGrantsValue.Grantee.CanonicalUser));
+                                    if (publicRequestAccessControlPolicyGrantsValue.Grantee.IsSetURI())
+                                        xmlWriter.WriteElementString("URI", S3Transforms.ToXmlStringValue(publicRequestAccessControlPolicyGrantsValue.Grantee.URI));
+                                    xmlWriter.WriteEndElement();
+                                }
+                                if (publicRequestAccessControlPolicyGrantsValue.IsSetPermission())
+                                    xmlWriter.WriteElementString("Permission", S3Transforms.ToXmlStringValue(publicRequestAccessControlPolicyGrantsValue.Permission));
+
                                 xmlWriter.WriteEndElement();
                             }
-                            if(publicRequestAccessControlPolicyGrantsValue.IsSetPermission())
-                                xmlWriter.WriteElementString("Permission", StringUtils.FromString(publicRequestAccessControlPolicyGrantsValue.Permission));
-                            xmlWriter.WriteEndElement();
                         }
-                        }            
-                        xmlWriter.WriteEndElement();            
+                        xmlWriter.WriteEndElement();
                     }
                     if (publicRequest.AccessControlPolicy.Owner != null)
                     {
                         xmlWriter.WriteStartElement("Owner");
-                        if(publicRequest.AccessControlPolicy.Owner.IsSetDisplayName())
+                        if (publicRequest.AccessControlPolicy.Owner.IsSetDisplayName())
                             xmlWriter.WriteElementString("DisplayName", StringUtils.FromString(publicRequest.AccessControlPolicy.Owner.DisplayName));
-                        if(publicRequest.AccessControlPolicy.Owner.IsSetId())
+
+                        if (publicRequest.AccessControlPolicy.Owner.IsSetId())
                             xmlWriter.WriteElementString("ID", StringUtils.FromString(publicRequest.AccessControlPolicy.Owner.Id));
+
                         xmlWriter.WriteEndElement();
                     }
 
                     xmlWriter.WriteEndElement();
                 }
             }
-            PostMarshallCustomization(request, publicRequest);
-            try 
+            try
             {
                 string content = stringWriter.ToString();
                 request.Content = System.Text.Encoding.UTF8.GetBytes(content);
                 request.Headers["Content-Type"] = "application/xml";
+
                 ChecksumUtils.SetChecksumData(
                     request,
                     publicRequest.ChecksumAlgorithm,
                     fallbackToMD5: false,
                     isRequestChecksumRequired: true,
-                    headerName: "x-amz-sdk-checksum-algorithm"
+                    headerName: S3Constants.AmzHeaderSdkChecksumAlgorithm
                 );
-                request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2006-03-01";            
-            } 
-            catch (EncoderFallbackException e) 
+            }
+            catch (EncoderFallbackException e)
             {
                 throw new AmazonServiceException("Unable to marshall request to XML", e);
             }
+
             request.UseQueryString = true;
             return request;
         }
-        private static PutObjectAclRequestMarshaller _instance = new PutObjectAclRequestMarshaller();        
+        private static PutObjectAclRequestMarshaller _instance = new PutObjectAclRequestMarshaller();
 
         internal static PutObjectAclRequestMarshaller GetInstance()
         {
@@ -207,6 +212,5 @@ public static PutObjectAclRequestMarshaller Instance
             }
         }
 
-        partial void PostMarshallCustomization(DefaultRequest defaultRequest, PutObjectAclRequest publicRequest);
-    }    
+    }
 }
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectAclResponseUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutObjectACLResponseUnmarshaller.cs
similarity index 55%
rename from sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectAclResponseUnmarshaller.cs
rename to sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutObjectACLResponseUnmarshaller.cs
index a015b09a66e0..ea2e8270e712 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectAclResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutObjectACLResponseUnmarshaller.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License").
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for PutObjectAcl operation
     /// </summary>  
-    public partial class PutObjectAclResponseUnmarshaller : S3ReponseUnmarshaller
+    public class PutObjectAclResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,46 +48,14 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             PutObjectAclResponse response = new PutObjectAclResponse();
             if (context.ResponseData.IsHeaderPresent("x-amz-request-charged"))
                 response.RequestCharged = context.ResponseData.GetHeaderValue("x-amz-request-charged");
-            
-            PostUnmarshallCustomization(context, response);
-            return response;
-        }        
-  
-
-        /// <summary>
-        /// Unmarshaller error response to exception.
-        /// </summary>  
-        /// <param name="context"></param>
-        /// <param name="innerException"></param>
-        /// <param name="statusCode"></param>
-        /// <returns></returns>
-        public override AmazonServiceException UnmarshallException(XmlUnmarshallerContext context, Exception innerException, HttpStatusCode statusCode)
-        {
-            S3ErrorResponse errorResponse = S3ErrorResponseUnmarshaller.Instance.Unmarshall(context);
-            errorResponse.InnerException = innerException;
-            errorResponse.StatusCode = statusCode;
 
-            var responseBodyBytes = context.GetResponseBodyBytes();
-
-            using (var streamCopy = new MemoryStream(responseBodyBytes))
-            using (var contextCopy = new XmlUnmarshallerContext(streamCopy, false, null))
-            {
-                if (errorResponse.Code != null && errorResponse.Code.Equals("NoSuchKey"))
-                {
-                    return NoSuchKeyExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse);
-                }
-            }
-            return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
+            return response;
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, PutObjectAclResponse response);
 
-        private static PutObjectAclResponseUnmarshaller _instance = new PutObjectAclResponseUnmarshaller();        
 
-        internal static PutObjectAclResponseUnmarshaller GetInstance()
-        {
-            return _instance;
-        }
+        private static PutObjectAclResponseUnmarshaller _instance = new PutObjectAclResponseUnmarshaller();
+
 
         /// <summary>
         /// Gets the singleton.
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/RestoreStatusUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RestoreStatusUnmarshaller.cs
similarity index 51%
rename from sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/RestoreStatusUnmarshaller.cs
rename to sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RestoreStatusUnmarshaller.cs
index bef7e955b4d4..d2563edddf95 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/RestoreStatusUnmarshaller.cs
+++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RestoreStatusUnmarshaller.cs
@@ -1,45 +1,18 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
+using Amazon.Runtime.Internal.Transform;
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Net;
+using System.Linq;
 using System.Text;
-using System.Xml.Serialization;
-
-using Amazon.S3.Model;
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-using Amazon.Runtime.Internal.Transform;
-using Amazon.Runtime.Internal.Util;
 
-#pragma warning disable CS0612,CS0618
 namespace Amazon.S3.Model.Internal.MarshallTransformations
 {
     /// <summary>
     /// Response Unmarshaller for RestoreStatus Object
     /// </summary>  
-    public partial class RestoreStatusUnmarshaller : IXmlUnmarshaller<RestoreStatus, XmlUnmarshallerContext>
+    public class RestoreStatusUnmarshaller : IXmlUnmarshaller<RestoreStatus, XmlUnmarshallerContext>
     {
         /// <summary>
-        /// Unmarshaller the response from the service to the response class.
+        /// Unmarshall the response from the service to the response class.
         /// </summary>  
         /// <param name="context"></param>
         /// <returns></returns>
@@ -48,40 +21,36 @@ public RestoreStatus Unmarshall(XmlUnmarshallerContext context)
             RestoreStatus unmarshalledObject = new RestoreStatus();
             int originalDepth = context.CurrentDepth;
             int targetDepth = originalDepth + 1;
-            
-            if (context.IsStartOfDocument) 
-               targetDepth += 2;
-            
+
+            if (context.IsStartOfDocument)
+                targetDepth += 2;
+
             while (context.Read())
             {
                 if (context.IsStartElement || context.IsAttribute)
                 {
                     if (context.TestExpression("IsRestoreInProgress", targetDepth))
                     {
-                        var unmarshaller = NullableBoolUnmarshaller.Instance;
+                        var unmarshaller = BoolUnmarshaller.Instance;
                         unmarshalledObject.IsRestoreInProgress = unmarshaller.Unmarshall(context);
                         continue;
                     }
                     if (context.TestExpression("RestoreExpiryDate", targetDepth))
                     {
-                        var unmarshaller = NullableDateTimeUnmarshaller.Instance;
+                        var unmarshaller = DateTimeUnmarshaller.Instance;
                         unmarshalledObject.RestoreExpiryDate = unmarshaller.Unmarshall(context);
                         continue;
                     }
-
-                    XmlStructureUnmarshallCustomization(context, unmarshalledObject, targetDepth);
                 }
                 else if (context.IsEndElement && context.CurrentDepth < originalDepth)
                 {
                     return unmarshalledObject;
                 }
-            }          
+            }
             return unmarshalledObject;
         }
 
-        partial void XmlStructureUnmarshallCustomization(XmlUnmarshallerContext context, RestoreStatus unmarshalledObject, int targetDepth);
-
-        private static RestoreStatusUnmarshaller _instance = new RestoreStatusUnmarshaller();        
+        private static RestoreStatusUnmarshaller _instance = new RestoreStatusUnmarshaller();
 
         /// <summary>
         /// Gets the singleton.
@@ -94,4 +63,5 @@ public static RestoreStatusUnmarshaller Instance
             }
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/sdk/src/Services/S3/Generated/Model/ListObjectsV2Request.cs b/sdk/src/Services/S3/Custom/Model/ListObjectsV2Request.cs
similarity index 59%
rename from sdk/src/Services/S3/Generated/Model/ListObjectsV2Request.cs
rename to sdk/src/Services/S3/Custom/Model/ListObjectsV2Request.cs
index 621909c345b1..8002c39c2612 100644
--- a/sdk/src/Services/S3/Generated/Model/ListObjectsV2Request.cs
+++ b/sdk/src/Services/S3/Custom/Model/ListObjectsV2Request.cs
@@ -12,21 +12,15 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
 using System.Text;
 using System.IO;
-using System.Net;
 
 using Amazon.Runtime;
 using Amazon.Runtime.Internal;
 
-#pragma warning disable CS0612,CS0618,CS1570
 namespace Amazon.S3.Model
 {
     /// <summary>
@@ -39,28 +33,15 @@ namespace Amazon.S3.Model
     /// object keys programmatically</a> in the <i>Amazon S3 User Guide</i>. To get a list
     /// of your buckets, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListBuckets.html">ListBuckets</a>.
     /// 
-    ///  <note> <ul> <li> 
-    /// <para>
-    ///  <b>General purpose bucket</b> - For general purpose buckets, <c>ListObjectsV2</c>
-    /// doesn't return prefixes that are related only to in-progress multipart uploads.
-    /// </para>
-    ///  </li> <li> 
-    /// <para>
-    ///  <b>Directory buckets</b> - For directory buckets, <c>ListObjectsV2</c> response includes
-    /// the prefixes that are related only to in-progress multipart uploads. 
-    /// </para>
-    ///  </li> <li> 
+    ///  <note> 
     /// <para>
     ///  <b>Directory buckets</b> - For directory buckets, you must make requests for this
     /// API operation to the Zonal endpoint. These endpoints support virtual-hosted-style
-    /// requests in the format <c>https://<i>amzn-s3-demo-bucket</i>.s3express-<i>zone-id</i>.<i>region-code</i>.amazonaws.com/<i>key-name</i>
-    /// </c>. Path-style requests are not supported. For more information about endpoints
-    /// in Availability Zones, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/endpoint-directory-buckets-AZ.html">Regional
-    /// and Zonal endpoints for directory buckets in Availability Zones</a> in the <i>Amazon
-    /// S3 User Guide</i>. For more information about endpoints in Local Zones, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/s3-lzs-for-directory-buckets.html">Concepts
-    /// for directory buckets in Local Zones</a> in the <i>Amazon S3 User Guide</i>.
+    /// requests in the format <c>https://<i>bucket_name</i>.s3express-<i>az_id</i>.<i>region</i>.amazonaws.com/<i>key-name</i>
+    /// </c>. Path-style requests are not supported. For more information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/s3-express-Regions-and-Zones.html">Regional
+    /// and Zonal endpoints</a> in the <i>Amazon S3 User Guide</i>.
     /// </para>
-    ///  </li> </ul> </note> <dl> <dt>Permissions</dt> <dd> <ul> <li> 
+    ///  </note> <dl> <dt>Permissions</dt> <dd> <ul> <li> 
     /// <para>
     ///  <b>General purpose bucket permissions</b> - To use this operation, you must have
     /// READ access to the bucket. You must have permission to perform the <c>s3:ListBucket</c>
@@ -96,7 +77,7 @@ namespace Amazon.S3.Model
     /// </para>
     ///  </li> </ul> </dd> <dt>HTTP Host header syntax</dt> <dd> 
     /// <para>
-    ///  <b>Directory buckets </b> - The HTTP Host header syntax is <c> <i>Bucket-name</i>.s3express-<i>zone-id</i>.<i>region-code</i>.amazonaws.com</c>.
+    ///  <b>Directory buckets </b> - The HTTP Host header syntax is <c> <i>Bucket_name</i>.s3express-<i>az_id</i>.<i>region</i>.amazonaws.com</c>.
     /// </para>
     ///  </dd> </dl> <important> 
     /// <para>
@@ -127,88 +108,82 @@ namespace Amazon.S3.Model
     /// </summary>
     public partial class ListObjectsV2Request : AmazonWebServiceRequest
     {
-        private string _bucketName;
-        private string _continuationToken;
-        private string _delimiter;
-        private EncodingType _encoding;
-        private string _expectedBucketOwner;
-        private bool? _fetchOwner;
-        private int? _maxKeys;
+        private string bucketName;
+        private string continuationToken;
+        private string delimiter;
+        private EncodingType encoding;
+        private string expectedBucketOwner;
+        private bool? fetchOwner;
+        private int? maxKeys;
         private List<string> _optionalObjectAttributes = AWSConfigs.InitializeCollections ? new List<string>() : null;
-        private string _prefix;
-        private RequestPayer _requestPayer;
-        private string _startAfter;
+        private string prefix;
+        private RequestPayer requestPayer;
+        private string startAfter;
 
         /// <summary>
         /// Gets and sets the property BucketName. 
-        /// <para>
-        ///  <b>Directory buckets</b> - When you use this operation with a directory bucket, you
-        /// must use virtual-hosted-style requests in the format <c> <i>Bucket-name</i>.s3express-<i>zone-id</i>.<i>region-code</i>.amazonaws.com</c>.
-        /// Path-style requests are not supported. Directory bucket names must be unique in the
-        /// chosen Zone (Availability Zone or Local Zone). Bucket names must follow the format
-        /// <c> <i>bucket-base-name</i>--<i>zone-id</i>--x-s3</c> (for example, <c> <i>amzn-s3-demo-bucket</i>--<i>usw2-az1</i>--x-s3</c>).
-        /// For information about bucket naming restrictions, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/directory-bucket-naming-rules.html">Directory
-        /// bucket naming rules</a> in the <i>Amazon S3 User Guide</i>.
-        /// </para>
-        ///  
-        /// <para>
-        ///  <b>Access points</b> - When you use this action with an access point for general
-        /// purpose buckets, you must provide the alias of the access point in place of the bucket
-        /// name or specify the access point ARN. When you use this action with an access point
-        /// for directory buckets, you must provide the access point name in place of the bucket
-        /// name. When using the access point ARN, you must direct requests to the access point
-        /// hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com.
-        /// When using this action with an access point through the Amazon Web Services SDKs,
-        /// you provide the access point ARN in place of the bucket name. For more information
-        /// about access point ARNs, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html">Using
-        /// access points</a> in the <i>Amazon S3 User Guide</i>.
-        /// </para>
-        ///  <note> 
+        /// <para> 
+        /// <b>Directory buckets</b> - When you use this operation with a directory bucket, you must use virtual-hosted-style requests in the 
+        /// format <c> <i>Bucket-name</i>.s3express-<i>zone-id</i>.<i>region-code</i>.amazonaws.com</c>. Path-style requests are not 
+        /// supported. Directory bucket names must be unique in the chosen Zone (Availability Zone or Local Zone). Bucket names must follow the 
+        /// format <c> <i>bucket-base-name</i>--<i>zone-id</i>--x-s3</c> (for example, <c> <i>amzn-s3-demo-bucket</i>--<i>usw2-az1</i>--x-s3</c>). For 
+        /// information about bucket naming restrictions, see 
+        /// <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/directory-bucket-naming-rules.html">Directory bucket naming rules</a> in 
+        /// the <i>Amazon S3 User Guide</i>.
+        /// </para> 
+        /// <para> 
+        /// <b>Access points</b> - When you use this action with an access point for general purpose buckets, you must provide the alias of the access 
+        /// point in place of the bucket name or specify the access point ARN. When you use this action with an access point for directory buckets, you 
+        /// must provide the access point name in place of the bucket name. When using the access point ARN, you must direct requests to the access 
+        /// point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When 
+        /// using this action with an access point through the Amazon Web Services SDKs, you provide the access point ARN in place of the bucket name. For 
+        /// more information about access point ARNs, see 
+        /// <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html">Using access points</a> in the <i>Amazon S3 User Guide</i>.
+        /// </para> 
+        /// <note> 
         /// <para>
         /// Object Lambda access points are not supported by directory buckets.
-        /// </para>
-        ///  </note> 
-        /// <para>
-        ///  <b>S3 on Outposts</b> - When you use this action with S3 on Outposts, you must direct
-        /// requests to the S3 on Outposts hostname. The S3 on Outposts hostname takes the form
-        /// <c> <i>AccessPointName</i>-<i>AccountId</i>.<i>outpostID</i>.s3-outposts.<i>Region</i>.amazonaws.com</c>.
-        /// When you use this action with S3 on Outposts, the destination bucket must be the Outposts
-        /// access point ARN or the access point alias. For more information about S3 on Outposts,
-        /// see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html">What
-        /// is S3 on Outposts?</a> in the <i>Amazon S3 User Guide</i>.
+        /// </para> 
+        /// </note> 
+        /// <para> 
+        /// <b>S3 on Outposts</b> - When you use this action with S3 on Outposts, you must direct requests to the S3 on Outposts hostname. The S3 on Outposts 
+        /// hostname takes the form <c> <i>AccessPointName</i>-<i>AccountId</i>.<i>outpostID</i>.s3-outposts.<i>Region</i>.amazonaws.com</c>. When you use this 
+        /// action with S3 on Outposts, the destination bucket must be the Outposts access point ARN or the access point alias. For more information about S3 
+        /// on Outposts, see 
+        /// <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html">What is S3 on Outposts?</a> in the <i>Amazon S3 User Guide</i>.
         /// </para>
         /// </summary>
         public string BucketName
         {
-            get { return this._bucketName; }
-            set { this._bucketName = value; }
+            get { return this.bucketName; }
+            set { this.bucketName = value; }
         }
 
-        // Check to see if BucketName property is set
+        // Check to see if Bucket property is set
         internal bool IsSetBucketName()
         {
-            return this._bucketName != null;
+            return this.bucketName != null;
         }
 
         /// <summary>
         /// Gets and sets the property ContinuationToken. 
         /// <para>
         ///  <c>ContinuationToken</c> indicates to Amazon S3 that the list is being continued
-        /// on this bucket with a token. <c>ContinuationToken</c> is obfuscated and is not a real
-        /// key. You can use this <c>ContinuationToken</c> for pagination of the list results.
-        /// 
+        /// on this bucket with a token. <c>ContinuationToken</c> is obfuscated and is not
+        /// a real key. You can use this <c>ContinuationToken</c> for pagination of the
+        /// list results. 
         /// </para>
         /// </summary>
         public string ContinuationToken
         {
-            get { return this._continuationToken; }
-            set { this._continuationToken = value; }
+            get { return this.continuationToken; }
+            set { this.continuationToken = value; }
         }
 
         // Check to see if ContinuationToken property is set
         internal bool IsSetContinuationToken()
         {
-            return this._continuationToken != null;
+            return this.continuationToken != null;
         }
 
         /// <summary>
@@ -216,10 +191,8 @@ internal bool IsSetContinuationToken()
         /// <para>
         /// A delimiter is a character that you use to group keys.
         /// </para>
-        ///  
         /// <para>
-        ///  <c>CommonPrefixes</c> is filtered out from results if it is not lexicographically
-        /// greater than the <c>StartAfter</c> value.
+        /// <c>CommonPrefixes</c> is filtered out from results if it is not lexicographically greater than the <c>StartAfter</c> value.
         /// </para>
         ///  <note> <ul> <li> 
         /// <para>
@@ -238,46 +211,34 @@ internal bool IsSetContinuationToken()
         /// </summary>
         public string Delimiter
         {
-            get { return this._delimiter; }
-            set { this._delimiter = value; }
+            get { return this.delimiter; }
+            set { this.delimiter = value; }
         }
 
         // Check to see if Delimiter property is set
         internal bool IsSetDelimiter()
         {
-            return this._delimiter != null;
+            return this.delimiter != null;
         }
 
         /// <summary>
-        /// Gets and sets the property Encoding. 
-        /// <para>
-        /// Encoding type used by Amazon S3 to encode the <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html">object
-        /// keys</a> in the response. Responses are encoded only in UTF-8. An object key can contain
-        /// any Unicode character. However, the XML 1.0 parser can't parse certain characters,
-        /// such as characters with an ASCII value from 0 to 10. For characters that aren't supported
-        /// in XML 1.0, you can add this parameter to request that Amazon S3 encode the keys in
-        /// the response. For more information about characters to avoid in object key names,
-        /// see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html#object-key-guidelines">Object
-        /// key naming guidelines</a>.
-        /// </para>
-        ///  <note> 
+        /// Gets and sets the property EncodingType. 
         /// <para>
-        /// When using the URL encoding type, non-ASCII characters that are used in an object's
-        /// key name will be percent-encoded according to UTF-8 code values. For example, the
-        /// object <c>test_file(3).png</c> will appear as <c>test_file%283%29.png</c>.
+        /// Encoding type used by Amazon S3 to encode object keys in the response. If using <c>url</c>,
+        /// non-ASCII characters used in an object's key name will be URL encoded. For example,
+        /// the object test_file(3).png will appear as test_file%283%29.png.
         /// </para>
-        ///  </note>
         /// </summary>
         public EncodingType Encoding
         {
-            get { return this._encoding; }
-            set { this._encoding = value; }
+            get { return this.encoding; }
+            set { this.encoding = value; }
         }
 
-        // Check to see if Encoding property is set
+        // Check to see if DeleteMarker property is set
         internal bool IsSetEncoding()
         {
-            return this._encoding != null;
+            return this.encoding != null;
         }
 
         /// <summary>
@@ -290,21 +251,24 @@ internal bool IsSetEncoding()
         /// </summary>
         public string ExpectedBucketOwner
         {
-            get { return this._expectedBucketOwner; }
-            set { this._expectedBucketOwner = value; }
+            get { return this.expectedBucketOwner; }
+            set { this.expectedBucketOwner = value; }
         }
 
-        // Check to see if ExpectedBucketOwner property is set
+        /// <summary>
+        /// Checks to see if ExpectedBucketOwner is set.
+        /// </summary>
+        /// <returns>true, if ExpectedBucketOwner property is set.</returns>
         internal bool IsSetExpectedBucketOwner()
         {
-            return this._expectedBucketOwner != null;
+            return !String.IsNullOrEmpty(this.expectedBucketOwner);
         }
 
         /// <summary>
         /// Gets and sets the property FetchOwner. 
         /// <para>
-        /// The owner field is not present in <c>ListObjectsV2</c> by default. If you want to
-        /// return the owner field with each key in the result, then set the <c>FetchOwner</c>
+        /// The owner field is not present in <c>ListObjectsV2</c> by default. If you want
+        /// to return the owner field with each key in the result, then set the <c>FetchOwner</c>
         /// field to <c>true</c>.
         /// </para>
         ///  <note> 
@@ -316,34 +280,34 @@ internal bool IsSetExpectedBucketOwner()
         /// </summary>
         public bool? FetchOwner
         {
-            get { return this._fetchOwner; }
-            set { this._fetchOwner = value; }
+            get { return this.fetchOwner; }
+            set { this.fetchOwner = value; }
         }
 
         // Check to see if FetchOwner property is set
         internal bool IsSetFetchOwner()
         {
-            return this._fetchOwner.HasValue; 
+            return this.fetchOwner != null;
         }
 
         /// <summary>
         /// Gets and sets the property MaxKeys. 
         /// <para>
-        /// Sets the maximum number of keys returned in the response. By default, the action returns
+        /// Sets the maximum number of keys returned in the response. By default the action returns
         /// up to 1,000 key names. The response might contain fewer keys but will never contain
         /// more.
         /// </para>
         /// </summary>
         public int? MaxKeys
         {
-            get { return this._maxKeys; }
-            set { this._maxKeys = value; }
+            get { return this.maxKeys; }
+            set { this.maxKeys = value; }
         }
-
+        
         // Check to see if MaxKeys property is set
         internal bool IsSetMaxKeys()
         {
-            return this._maxKeys.HasValue; 
+            return this.maxKeys.HasValue;
         }
 
         /// <summary>
@@ -357,11 +321,6 @@ internal bool IsSetMaxKeys()
         /// This functionality is not supported for directory buckets.
         /// </para>
         ///  </note>
-        /// <para />
-        /// Starting with version 4 of the SDK this property will default to null. If no data for this property is returned
-        /// from the service the property will also be null. This was changed to improve performance and allow the SDK and caller
-        /// to distinguish between a property not set or a property being empty to clear out a value. To retain the previous
-        /// SDK behavior set the AWSConfigs.InitializeCollections static property to true.
         /// </summary>
         public List<string> OptionalObjectAttributes
         {
@@ -372,7 +331,7 @@ public List<string> OptionalObjectAttributes
         // Check to see if OptionalObjectAttributes property is set
         internal bool IsSetOptionalObjectAttributes()
         {
-            return this._optionalObjectAttributes != null;
+            return this._optionalObjectAttributes != null && (this._optionalObjectAttributes.Count > 0 || !AWSConfigs.InitializeCollections);
         }
 
         /// <summary>
@@ -389,14 +348,14 @@ internal bool IsSetOptionalObjectAttributes()
         /// </summary>
         public string Prefix
         {
-            get { return this._prefix; }
-            set { this._prefix = value; }
+            get { return this.prefix; }
+            set { this.prefix = value; }
         }
 
         // Check to see if Prefix property is set
         internal bool IsSetPrefix()
         {
-            return this._prefix != null;
+            return this.prefix != null;
         }
 
         /// <summary>
@@ -413,14 +372,17 @@ internal bool IsSetPrefix()
         /// </summary>
         public RequestPayer RequestPayer
         {
-            get { return this._requestPayer; }
-            set { this._requestPayer = value; }
+            get { return this.requestPayer; }
+            set { this.requestPayer = value; }
         }
 
-        // Check to see if RequestPayer property is set
+        /// <summary>
+        /// Checks to see if RequetsPayer is set.
+        /// </summary>
+        /// <returns>true, if RequestPayer property is set.</returns>
         internal bool IsSetRequestPayer()
         {
-            return this._requestPayer != null;
+            return requestPayer != null;
         }
 
         /// <summary>
@@ -437,15 +399,16 @@ internal bool IsSetRequestPayer()
         /// </summary>
         public string StartAfter
         {
-            get { return this._startAfter; }
-            set { this._startAfter = value; }
+            get { return this.startAfter; }
+            set { this.startAfter = value; }
         }
 
         // Check to see if StartAfter property is set
         internal bool IsSetStartAfter()
         {
-            return this._startAfter != null;
+            return this.StartAfter != null;
         }
 
     }
-}
\ No newline at end of file
+}
+    
diff --git a/sdk/src/Services/S3/Generated/Model/ListObjectsV2Response.cs b/sdk/src/Services/S3/Custom/Model/ListObjectsV2Response.cs
similarity index 51%
rename from sdk/src/Services/S3/Generated/Model/ListObjectsV2Response.cs
rename to sdk/src/Services/S3/Custom/Model/ListObjectsV2Response.cs
index e9d98f8e2376..37886725c748 100644
--- a/sdk/src/Services/S3/Generated/Model/ListObjectsV2Response.cs
+++ b/sdk/src/Services/S3/Custom/Model/ListObjectsV2Response.cs
@@ -12,41 +12,33 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
 using System.Text;
-using System.IO;
-using System.Net;
 
 using Amazon.Runtime;
-using Amazon.Runtime.Internal;
 
-#pragma warning disable CS0612,CS0618,CS1570
 namespace Amazon.S3.Model
 {
     /// <summary>
-    /// This is the response object from the ListObjectsV2 operation.
+    /// Returns information about the  ListObjects response and response metadata.
     /// </summary>
-    public partial class ListObjectsV2Response : AmazonWebServiceResponse
+    public class ListObjectsV2Response : AmazonWebServiceResponse
     {
-        private List<string> _commonPrefixes = AWSConfigs.InitializeCollections ? new List<string>() : null;
-        private string _continuationToken;
-        private string _delimiter;
-        private EncodingType _encoding;
-        private bool? _isTruncated;
-        private int? _keyCount;
-        private int? _maxKeys;
-        private string _name;
-        private string _nextContinuationToken;
-        private string _prefix;
+        private List<string> commonPrefixes = AWSConfigs.InitializeCollections ? new List<string>() : null;
+        private List<S3Object> contents = AWSConfigs.InitializeCollections ? new List<S3Object>() : null;
+        private string continuationToken;
+        private string delimiter;
+        private EncodingType encoding;
+        private bool? isTruncated;
+        private int? keyCount;
+        private int? maxKeys;
+        private string name;
+        private string nextContinuationToken;
+        private string prefix;
         private RequestCharged _requestCharged;
-        private List<S3Object> _s3Objects = AWSConfigs.InitializeCollections ? new List<S3Object>() : null;
-        private string _startAfter;
+        private string startAfter;
 
         /// <summary>
         /// Gets and sets the property CommonPrefixes. 
@@ -57,189 +49,193 @@ public partial class ListObjectsV2Response : AmazonWebServiceResponse
         /// </para>
         ///  
         /// <para>
-        /// A response can contain <c>CommonPrefixes</c> only if you specify a delimiter.
+        /// A response can contain <code>CommonPrefixes</code> only if you specify a delimiter.
         /// </para>
         ///  
         /// <para>
-        ///  <c>CommonPrefixes</c> contains all (if there are any) keys between <c>Prefix</c>
+        ///  <code>CommonPrefixes</code> contains all (if there are any) keys between <code>Prefix</code>
         /// and the next occurrence of the string specified by a delimiter.
         /// </para>
         ///  
         /// <para>
-        ///  <c>CommonPrefixes</c> lists keys that act like subdirectories in the directory specified
-        /// by <c>Prefix</c>.
+        ///  <code>CommonPrefixes</code> lists keys that act like subdirectories in the directory
+        /// specified by <code>Prefix</code>.
         /// </para>
         ///  
         /// <para>
-        /// For example, if the prefix is <c>notes/</c> and the delimiter is a slash (<c>/</c>)
-        /// as in <c>notes/summer/july</c>, the common prefix is <c>notes/summer/</c>. All of
-        /// the keys that roll up into a common prefix count as a single return when calculating
+        /// For example, if the prefix is <code>notes/</code> and the delimiter is a slash (<code>/</code>)
+        /// as in <code>notes/summer/july</code>, the common prefix is <code>notes/summer/</code>.
+        /// All of the keys that roll up into a common prefix count as a single return when calculating
         /// the number of returns. 
         /// </para>
         ///  <note> <ul> <li> 
         /// <para>
         ///  <b>Directory buckets</b> - For directory buckets, only prefixes that end in a delimiter
-        /// (<c>/</c>) are supported.
+        /// (<code>/</code>) are supported.
         /// </para>
         ///  </li> <li> 
         /// <para>
-        ///  <b>Directory buckets </b> - When you query <c>ListObjectsV2</c> with a delimiter
-        /// during in-progress multipart uploads, the <c>CommonPrefixes</c> response parameter
+        ///  <b>Directory buckets </b> - When you query <code>ListObjectsV2</code> with a delimiter
+        /// during in-progress multipart uploads, the <code>CommonPrefixes</code> response parameter
         /// contains the prefixes that are associated with the in-progress multipart uploads.
         /// For more information about multipart uploads, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuoverview.html">Multipart
         /// Upload Overview</a> in the <i>Amazon S3 User Guide</i>.
         /// </para>
         ///  </li> </ul> </note>
-        /// <para />
-        /// Starting with version 4 of the SDK this property will default to null. If no data for this property is returned
-        /// from the service the property will also be null. This was changed to improve performance and allow the SDK and caller
-        /// to distinguish between a property not set or a property being empty to clear out a value. To retain the previous
-        /// SDK behavior set the AWSConfigs.InitializeCollections static property to true.
         /// </summary>
         public List<string> CommonPrefixes
         {
-            get { return this._commonPrefixes; }
-            set { this._commonPrefixes = value; }
+            get { return this.commonPrefixes; }
+            set { this.commonPrefixes = value; }
         }
 
         // Check to see if CommonPrefixes property is set
         internal bool IsSetCommonPrefixes()
         {
-            return this._commonPrefixes != null && (this._commonPrefixes.Count > 0 || !AWSConfigs.InitializeCollections); 
+            return this.commonPrefixes != null && (this.commonPrefixes.Count > 0 || !AWSConfigs.InitializeCollections);
+        }
+
+        /// <summary>
+        /// Gets and sets the S3Objects property. Metadata about each object returned.
+        /// </summary>
+        public List<S3Object> S3Objects
+        {
+            get { return this.contents; }
+            set { this.contents = value; }
+        }
+
+        // Check to see if Contents property is set
+        internal bool IsSetContents()
+        {
+            return this.contents != null && (this.contents.Count > 0 || !AWSConfigs.InitializeCollections);
         }
 
         /// <summary>
         /// Gets and sets the property ContinuationToken. 
         /// <para>
-        ///  If <c>ContinuationToken</c> was sent with the request, it is included in the response.
-        /// You can use the returned <c>ContinuationToken</c> for pagination of the list response.
+        ///  If <code>ContinuationToken</code> was sent with the request, it is included in the
+        /// response. You can use the returned <code>ContinuationToken</code> for pagination of
+        /// the list response.
         /// </para>
         /// </summary>
         public string ContinuationToken
         {
-            get { return this._continuationToken; }
-            set { this._continuationToken = value; }
+            get { return this.continuationToken; }
+            set { this.continuationToken = value; }
         }
 
         // Check to see if ContinuationToken property is set
         internal bool IsSetContinuationToken()
         {
-            return this._continuationToken != null;
+            return this.continuationToken != null;
         }
 
         /// <summary>
         /// Gets and sets the property Delimiter. 
         /// <para>
-        /// Causes keys that contain the same string between the <c>prefix</c> and the first occurrence
-        /// of the delimiter to be rolled up into a single result element in the <c>CommonPrefixes</c>
+        /// Causes keys that contain the same string between the <code>prefix</code> and the first
+        /// occurrence of the delimiter to be rolled up into a single result element in the <code>CommonPrefixes</code>
         /// collection. These rolled-up keys are not returned elsewhere in the response. Each
-        /// rolled-up result counts as only one return against the <c>MaxKeys</c> value.
+        /// rolled-up result counts as only one return against the <code>MaxKeys</code> value.
         /// </para>
         ///  <note> 
         /// <para>
-        ///  <b>Directory buckets</b> - For directory buckets, <c>/</c> is the only supported
+        ///  <b>Directory buckets</b> - For directory buckets, <code>/</code> is the only supported
         /// delimiter.
         /// </para>
         ///  </note>
         /// </summary>
         public string Delimiter
         {
-            get { return this._delimiter; }
-            set { this._delimiter = value; }
-        }
-
-        // Check to see if Delimiter property is set
-        internal bool IsSetDelimiter()
-        {
-            return this._delimiter != null;
+            get { return this.delimiter; }
+            set { this.delimiter = value; }
         }
 
         /// <summary>
-        /// Gets and sets the property Encoding. 
+        /// Encoding type used by Amazon S3 to encode object keys in the response.
         /// <para>
         /// Encoding type used by Amazon S3 to encode object key names in the XML response.
         /// </para>
         ///  
         /// <para>
-        /// If you specify the <c>encoding-type</c> request parameter, Amazon S3 includes this
-        /// element in the response, and returns encoded key name values in the following response
-        /// elements:
+        /// If you specify the encoding-type request parameter, Amazon S3 includes this element
+        /// in the response, and returns encoded key name values in the following response elements:
         /// </para>
         ///  
         /// <para>
-        ///  <c>Delimiter, Prefix, Key,</c> and <c>StartAfter</c>.
+        ///  <code>Delimiter, Prefix, Key,</code> and <code>StartAfter</code>.
         /// </para>
         /// </summary>
         public EncodingType Encoding
         {
-            get { return this._encoding; }
-            set { this._encoding = value; }
+            get { return this.encoding; }
+            set { this.encoding = value; }
         }
 
-        // Check to see if Encoding property is set
+        // Check to see if DeleteMarker property is set
         internal bool IsSetEncoding()
         {
-            return this._encoding != null;
+            return this.encoding != null;
         }
 
         /// <summary>
         /// Gets and sets the property IsTruncated. 
         /// <para>
-        /// Set to <c>false</c> if all of the results were returned. Set to <c>true</c> if more
-        /// keys are available to return. If the number of results exceeds that specified by <c>MaxKeys</c>,
-        /// all of the results might not be returned.
+        /// Set to false if all of the results were returned. Set to true if more keys are available
+        /// to return. If the number of results exceeds that specified by MaxKeys, all of the
+        /// results might not be returned.
         /// </para>
         /// </summary>
         public bool? IsTruncated
         {
-            get { return this._isTruncated; }
-            set { this._isTruncated = value; }
+            get { return this.isTruncated; }
+            set { this.isTruncated = value; }
         }
 
         // Check to see if IsTruncated property is set
         internal bool IsSetIsTruncated()
         {
-            return this._isTruncated.HasValue; 
+            return this.isTruncated.HasValue;
         }
 
         /// <summary>
         /// Gets and sets the property KeyCount. 
         /// <para>
-        ///  <c>KeyCount</c> is the number of keys returned with this request. <c>KeyCount</c>
-        /// will always be less than or equal to the <c>MaxKeys</c> field. For example, if you
-        /// ask for 50 keys, your result will include 50 keys or fewer.
+        /// KeyCount is the number of keys returned with this request. KeyCount will always be
+        /// less than or equal to the <code>MaxKeys</code> field. Say you ask for 50 keys, your
+        /// result will include 50 keys or fewer.
         /// </para>
         /// </summary>
         public int? KeyCount
         {
-            get { return this._keyCount; }
-            set { this._keyCount = value; }
+            get { return this.keyCount; }
+            set { this.keyCount = value; }
         }
 
         // Check to see if KeyCount property is set
         internal bool IsSetKeyCount()
         {
-            return this._keyCount.HasValue; 
+            return this.keyCount.HasValue;
         }
 
         /// <summary>
         /// Gets and sets the property MaxKeys. 
         /// <para>
-        /// Sets the maximum number of keys returned in the response. By default, the action returns
+        /// Sets the maximum number of keys returned in the response. By default the action returns
         /// up to 1,000 key names. The response might contain fewer keys but will never contain
         /// more.
         /// </para>
         /// </summary>
         public int? MaxKeys
         {
-            get { return this._maxKeys; }
-            set { this._maxKeys = value; }
+            get { return this.maxKeys; }
+            set { this.maxKeys = value; }
         }
 
         // Check to see if MaxKeys property is set
         internal bool IsSetMaxKeys()
         {
-            return this._maxKeys.HasValue; 
+            return this.maxKeys.HasValue;
         }
 
         /// <summary>
@@ -247,38 +243,56 @@ internal bool IsSetMaxKeys()
         /// <para>
         /// The bucket name.
         /// </para>
+        ///  
+        /// <para>
+        /// When using this action with an access point, you must direct requests to the access
+        /// point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com.
+        /// When using this action with an access point through the Amazon Web Services SDKs,
+        /// you provide the access point ARN in place of the bucket name. For more information
+        /// about access point ARNs, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html">Using
+        /// access points</a> in the <i>Amazon S3 User Guide</i>.
+        /// </para>
+        ///  
+        /// <para>
+        /// When you use this action with Amazon S3 on Outposts, you must direct requests to the
+        /// S3 on Outposts hostname. The S3 on Outposts hostname takes the form <code> <i>AccessPointName</i>-<i>AccountId</i>.<i>outpostID</i>.s3-outposts.<i>Region</i>.amazonaws.com</code>.
+        /// When you use this action with S3 on Outposts through the Amazon Web Services SDKs,
+        /// you provide the Outposts access point ARN in place of the bucket name. For more information
+        /// about S3 on Outposts ARNs, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html">What
+        /// is S3 on Outposts</a> in the <i>Amazon S3 User Guide</i>.
+        /// </para>
         /// </summary>
         public string Name
         {
-            get { return this._name; }
-            set { this._name = value; }
+            get { return this.name; }
+            set { this.name = value; }
         }
 
         // Check to see if Name property is set
         internal bool IsSetName()
         {
-            return this._name != null;
+            return this.name != null;
         }
 
         /// <summary>
         /// Gets and sets the property NextContinuationToken. 
         /// <para>
-        ///  <c>NextContinuationToken</c> is sent when <c>isTruncated</c> is true, which means
-        /// there are more keys in the bucket that can be listed. The next list requests to Amazon
-        /// S3 can be continued with this <c>NextContinuationToken</c>. <c>NextContinuationToken</c>
+        ///  <code>NextContinuationToken</code> is sent when <code>isTruncated</code> is true,
+        /// which means there are more keys in the bucket that can be listed. The next list requests
+        /// to Amazon S3 can be continued with this <code>NextContinuationToken</code>. <code>NextContinuationToken</code>
         /// is obfuscated and is not a real key
         /// </para>
         /// </summary>
         public string NextContinuationToken
         {
-            get { return this._nextContinuationToken; }
-            set { this._nextContinuationToken = value; }
+            get { return this.nextContinuationToken; }
+            set { this.nextContinuationToken = value; }
         }
 
         // Check to see if NextContinuationToken property is set
         internal bool IsSetNextContinuationToken()
         {
-            return this._nextContinuationToken != null;
+            return this.nextContinuationToken != null;
         }
 
         /// <summary>
@@ -289,20 +303,20 @@ internal bool IsSetNextContinuationToken()
         ///  <note> 
         /// <para>
         ///  <b>Directory buckets</b> - For directory buckets, only prefixes that end in a delimiter
-        /// (<c>/</c>) are supported.
+        /// (<code>/</code>) are supported.
         /// </para>
         ///  </note>
         /// </summary>
         public string Prefix
         {
-            get { return this._prefix; }
-            set { this._prefix = value; }
+            get { return this.prefix; }
+            set { this.prefix = value; }
         }
 
         // Check to see if Prefix property is set
         internal bool IsSetPrefix()
         {
-            return this._prefix != null;
+            return this.prefix != null;
         }
 
         /// <summary>
@@ -320,29 +334,6 @@ internal bool IsSetRequestCharged()
             return this._requestCharged != null;
         }
 
-        /// <summary>
-        /// Gets and sets the property S3Objects. 
-        /// <para>
-        /// Metadata about each object returned.
-        /// </para>
-        /// <para />
-        /// Starting with version 4 of the SDK this property will default to null. If no data for this property is returned
-        /// from the service the property will also be null. This was changed to improve performance and allow the SDK and caller
-        /// to distinguish between a property not set or a property being empty to clear out a value. To retain the previous
-        /// SDK behavior set the AWSConfigs.InitializeCollections static property to true.
-        /// </summary>
-        public List<S3Object> S3Objects
-        {
-            get { return this._s3Objects; }
-            set { this._s3Objects = value; }
-        }
-
-        // Check to see if S3Objects property is set
-        internal bool IsSetS3Objects()
-        {
-            return this._s3Objects != null && (this._s3Objects.Count > 0 || !AWSConfigs.InitializeCollections); 
-        }
-
         /// <summary>
         /// Gets and sets the property StartAfter. 
         /// <para>
@@ -356,15 +347,15 @@ internal bool IsSetS3Objects()
         /// </summary>
         public string StartAfter
         {
-            get { return this._startAfter; }
-            set { this._startAfter = value; }
+            get { return this.startAfter; }
+            set { this.startAfter = value; }
         }
 
         // Check to see if StartAfter property is set
         internal bool IsSetStartAfter()
         {
-            return this._startAfter != null;
+            return this.startAfter != null;
         }
-
     }
-}
\ No newline at end of file
+}
+    
diff --git a/sdk/src/Services/S3/Generated/Model/ListVersionsRequest.cs b/sdk/src/Services/S3/Custom/Model/ListVersionsRequest.cs
similarity index 59%
rename from sdk/src/Services/S3/Generated/Model/ListVersionsRequest.cs
rename to sdk/src/Services/S3/Custom/Model/ListVersionsRequest.cs
index 94fe41d224df..f2377a74cc6c 100644
--- a/sdk/src/Services/S3/Generated/Model/ListVersionsRequest.cs
+++ b/sdk/src/Services/S3/Custom/Model/ListVersionsRequest.cs
@@ -1,3 +1,4 @@
+
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * 
@@ -12,42 +13,22 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
 using System.Text;
 using System.IO;
-using System.Net;
 
 using Amazon.Runtime;
 using Amazon.Runtime.Internal;
 
-#pragma warning disable CS0612,CS0618,CS1570
 namespace Amazon.S3.Model
 {
     /// <summary>
     /// Container for the parameters to the ListVersions operation.
-    /// <important> 
+    /// <note> 
     /// <para>
-    /// End of support notice: Beginning October 1, 2025, Amazon S3 will stop returning <c>DisplayName</c>.
-    /// Update your applications to use canonical IDs (unique identifier for Amazon Web Services
-    /// accounts), Amazon Web Services account ID (12 digit identifier) or IAM ARNs (full
-    /// resource naming) as a direct replacement of <c>DisplayName</c>. 
-    /// </para>
-    ///  
-    /// <para>
-    /// This change affects the following Amazon Web Services Regions: US East (N. Virginia)
-    /// Region, US West (N. California) Region, US West (Oregon) Region, Asia Pacific (Singapore)
-    /// Region, Asia Pacific (Sydney) Region, Asia Pacific (Tokyo) Region, Europe (Ireland)
-    /// Region, and South America (São Paulo) Region.
-    /// </para>
-    ///  </important> <note> 
-    /// <para>
-    /// This operation is not supported for directory buckets.
+    /// This operation is not supported by directory buckets.
     /// </para>
     ///  </note> 
     /// <para>
@@ -57,13 +38,13 @@ namespace Amazon.S3.Model
     /// </para>
     ///  <important> 
     /// <para>
-    ///  To use this operation, you must have permission to perform the <c>s3:ListBucketVersions</c>
+    ///  To use this operation, you must have permission to perform the <code>s3:ListBucketVersions</code>
     /// action. Be aware of the name difference. 
     /// </para>
     ///  </important> <note> 
     /// <para>
-    ///  A <c>200 OK</c> response can contain valid or invalid XML. Make sure to design your
-    /// application to parse the contents of the response and handle it appropriately.
+    ///  A <code>200 OK</code> response can contain valid or invalid XML. Make sure to design
+    /// your application to parse the contents of the response and handle it appropriately.
     /// </para>
     ///  </note> 
     /// <para>
@@ -71,7 +52,7 @@ namespace Amazon.S3.Model
     /// </para>
     ///  
     /// <para>
-    /// The following operations are related to <c>ListObjectVersions</c>:
+    /// The following operations are related to <code>ListObjectVersions</code>:
     /// </para>
     ///  <ul> <li> 
     /// <para>
@@ -97,16 +78,16 @@ namespace Amazon.S3.Model
     /// </summary>
     public partial class ListVersionsRequest : AmazonWebServiceRequest
     {
-        private string _bucketName;
-        private string _delimiter;
-        private EncodingType _encoding;
-        private string _expectedBucketOwner;
-        private string _keyMarker;
-        private int? _maxKeys;
+        private string bucketName;
+        private string delimiter;
+        private string keyMarker;
+        private int? maxKeys;
+        private string prefix;
         private List<string> _optionalObjectAttributes = AWSConfigs.InitializeCollections ? new List<string>() : null;
-        private string _prefix;
         private RequestPayer _requestPayer;
-        private string _versionIdMarker;
+        private string versionIdMarker;
+        private EncodingType encoding;
+        private string expectedBucketOwner;
 
         /// <summary>
         /// Gets and sets the property BucketName. 
@@ -116,94 +97,54 @@ public partial class ListVersionsRequest : AmazonWebServiceRequest
         /// </summary>
         public string BucketName
         {
-            get { return this._bucketName; }
-            set { this._bucketName = value; }
+            get { return this.bucketName; }
+            set { this.bucketName = value; }
         }
 
         // Check to see if BucketName property is set
         internal bool IsSetBucketName()
         {
-            return this._bucketName != null;
+            return this.bucketName != null;
         }
 
         /// <summary>
         /// Gets and sets the property Delimiter. 
         /// <para>
         /// A delimiter is a character that you specify to group keys. All keys that contain the
-        /// same string between the <c>prefix</c> and the first occurrence of the delimiter are
-        /// grouped under a single result element in <c>CommonPrefixes</c>. These groups are counted
-        /// as one result against the <c>max-keys</c> limitation. These keys are not returned
-        /// elsewhere in the response.
+        /// same string between the <c>prefix</c> and the first occurrence of the delimiter
+        /// are grouped under a single result element in <c>CommonPrefixes</c>. These groups
+        /// are counted as one result against the <c>max-keys</c> limitation. These keys
+        /// are not returned elsewhere in the response.
         /// </para>
-        ///  
         /// <para>
-        ///  <c>CommonPrefixes</c> is filtered out from results if it is not lexicographically
-        /// greater than the key-marker.
+        /// <c>CommonPrefixes</c> is filtered out from results if it is not lexicographically greater than the key-marker.
         /// </para>
         /// </summary>
         public string Delimiter
         {
-            get { return this._delimiter; }
-            set { this._delimiter = value; }
+            get { return this.delimiter; }
+            set { this.delimiter = value; }
         }
 
         // Check to see if Delimiter property is set
         internal bool IsSetDelimiter()
         {
-            return this._delimiter != null;
+            return this.delimiter != null;
         }
 
         /// <summary>
-        /// Gets and sets the property Encoding.
-        /// </summary>
-        public EncodingType Encoding
-        {
-            get { return this._encoding; }
-            set { this._encoding = value; }
-        }
-
-        // Check to see if Encoding property is set
-        internal bool IsSetEncoding()
-        {
-            return this._encoding != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ExpectedBucketOwner. 
-        /// <para>
-        /// The account ID of the expected bucket owner. If the account ID that you provide does
-        /// not match the actual owner of the bucket, the request fails with the HTTP status code
-        /// <c>403 Forbidden</c> (access denied).
-        /// </para>
-        /// </summary>
-        public string ExpectedBucketOwner
-        {
-            get { return this._expectedBucketOwner; }
-            set { this._expectedBucketOwner = value; }
-        }
-
-        // Check to see if ExpectedBucketOwner property is set
-        internal bool IsSetExpectedBucketOwner()
-        {
-            return this._expectedBucketOwner != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property KeyMarker. 
-        /// <para>
         /// Specifies the key to start with when listing objects in a bucket.
-        /// </para>
         /// </summary>
         public string KeyMarker
         {
-            get { return this._keyMarker; }
-            set { this._keyMarker = value; }
+            get { return this.keyMarker; }
+            set { this.keyMarker = value; }
         }
 
         // Check to see if KeyMarker property is set
         internal bool IsSetKeyMarker()
         {
-            return this._keyMarker != null;
+            return this.keyMarker != null;
         }
 
         /// <summary>
@@ -212,20 +153,20 @@ internal bool IsSetKeyMarker()
         /// Sets the maximum number of keys returned in the response. By default, the action returns
         /// up to 1,000 key names. The response might contain fewer keys but will never contain
         /// more. If additional keys satisfy the search criteria, but were not returned because
-        /// <c>max-keys</c> was exceeded, the response contains <c>&lt;isTruncated&gt;true&lt;/isTruncated&gt;</c>.
-        /// To return the additional keys, see <c>key-marker</c> and <c>version-id-marker</c>.
+        /// <code>max-keys</code> was exceeded, the response contains <code>&lt;isTruncated&gt;true&lt;/isTruncated&gt;</code>.
+        /// To return the additional keys, see <code>key-marker</code> and <code>version-id-marker</code>.
         /// </para>
         /// </summary>
         public int? MaxKeys
         {
-            get { return this._maxKeys; }
-            set { this._maxKeys = value; }
+            get { return this.maxKeys ?? default(int); }
+            set { this.maxKeys = value; }
         }
 
         // Check to see if MaxKeys property is set
         internal bool IsSetMaxKeys()
         {
-            return this._maxKeys.HasValue; 
+            return this.maxKeys.HasValue;
         }
 
         /// <summary>
@@ -234,11 +175,6 @@ internal bool IsSetMaxKeys()
         /// Specifies the optional fields that you want returned in the response. Fields that
         /// you do not specify are not returned.
         /// </para>
-        /// <para />
-        /// Starting with version 4 of the SDK this property will default to null. If no data for this property is returned
-        /// from the service the property will also be null. This was changed to improve performance and allow the SDK and caller
-        /// to distinguish between a property not set or a property being empty to clear out a value. To retain the previous
-        /// SDK behavior set the AWSConfigs.InitializeCollections static property to true.
         /// </summary>
         public List<string> OptionalObjectAttributes
         {
@@ -249,7 +185,7 @@ public List<string> OptionalObjectAttributes
         // Check to see if OptionalObjectAttributes property is set
         internal bool IsSetOptionalObjectAttributes()
         {
-            return this._optionalObjectAttributes != null;
+            return this._optionalObjectAttributes != null && (this._optionalObjectAttributes.Count > 0 || !AWSConfigs.InitializeCollections);
         }
 
         /// <summary>
@@ -257,21 +193,21 @@ internal bool IsSetOptionalObjectAttributes()
         /// <para>
         /// Use this parameter to select only those keys that begin with the specified prefix.
         /// You can use prefixes to separate a bucket into different groupings of keys. (You can
-        /// think of using <c>prefix</c> to make groups in the same way that you'd use a folder
-        /// in a file system.) You can use <c>prefix</c> with <c>delimiter</c> to roll up numerous
-        /// objects into a single result under <c>CommonPrefixes</c>. 
+        /// think of using <code>prefix</code> to make groups in the same way that you'd use a
+        /// folder in a file system.) You can use <code>prefix</code> with <code>delimiter</code>
+        /// to roll up numerous objects into a single result under <code>CommonPrefixes</code>.
         /// </para>
         /// </summary>
         public string Prefix
         {
-            get { return this._prefix; }
-            set { this._prefix = value; }
+            get { return this.prefix; }
+            set { this.prefix = value; }
         }
 
         // Check to see if Prefix property is set
         internal bool IsSetPrefix()
         {
-            return this._prefix != null;
+            return this.prefix != null;
         }
 
         /// <summary>
@@ -290,22 +226,66 @@ internal bool IsSetRequestPayer()
         }
 
         /// <summary>
-        /// Gets and sets the property VersionIdMarker. 
-        /// <para>
         /// Specifies the object version you want to start listing from.
-        /// </para>
         /// </summary>
         public string VersionIdMarker
         {
-            get { return this._versionIdMarker; }
-            set { this._versionIdMarker = value; }
+            get { return this.versionIdMarker; }
+            set { this.versionIdMarker = value; }
         }
 
         // Check to see if VersionIdMarker property is set
         internal bool IsSetVersionIdMarker()
         {
-            return this._versionIdMarker != null;
+            return this.versionIdMarker != null;
+        }
+
+        /// <summary>
+        /// <para>Encoding type used by Amazon S3 to encode the 
+        /// <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html">object keys</a> in 
+        /// the response. Responses are encoded only in UTF-8. An object key can contain any Unicode character. 
+        /// However, the XML 1.0 parser can't parse certain characters, such as characters with an ASCII value 
+        /// from 0 to 10. For characters that aren't supported in XML 1.0, you can add this parameter to request 
+        /// that Amazon S3 encode the keys in the response. For more information about characters to avoid in object 
+        /// key names, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html#object-key-guidelines">Object key naming guidelines</a>.
+        /// </para> <note> <para>When using the URL encoding type, non-ASCII characters that are used in an 
+        /// object's key name will be percent-encoded according to UTF-8 code values. For example, the object 
+        /// <code>test_file(3).png</code> will appear as <code>test_file%283%29.png</code>.</para> </note>
+        /// </summary>
+        public EncodingType Encoding
+        {
+            get { return this.encoding; }
+            set { this.encoding = value; }
+        }
+
+        // Check to see if DeleteMarker property is set
+        internal bool IsSetEncoding()
+        {
+            return this.encoding != null;
         }
 
+        /// <summary>
+        /// Gets and sets the property ExpectedBucketOwner. 
+        /// <para>
+        /// The account ID of the expected bucket owner. If the account ID that you provide does
+        /// not match the actual owner of the bucket, the request fails with the HTTP status code
+        /// <code>403 Forbidden</code> (access denied).
+        /// </para>
+        /// </summary>
+        public string ExpectedBucketOwner
+        {
+            get { return this.expectedBucketOwner; }
+            set { this.expectedBucketOwner = value; }
+        }
+
+        /// <summary>
+        /// Checks to see if ExpectedBucketOwner is set.
+        /// </summary>
+        /// <returns>true, if ExpectedBucketOwner property is set.</returns>
+        internal bool IsSetExpectedBucketOwner()
+        {
+            return !String.IsNullOrEmpty(this.expectedBucketOwner);
+        }
     }
-}
\ No newline at end of file
+}
+    
diff --git a/sdk/src/Services/S3/Custom/Model/ListVersionsResponse.cs b/sdk/src/Services/S3/Custom/Model/ListVersionsResponse.cs
new file mode 100644
index 000000000000..9d6cf4a3e769
--- /dev/null
+++ b/sdk/src/Services/S3/Custom/Model/ListVersionsResponse.cs
@@ -0,0 +1,251 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ * 
+ *  http://aws.amazon.com/apache2.0
+ * 
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+using System;
+using System.Collections.Generic;
+using System.Xml.Serialization;
+using System.Text;
+
+using Amazon.Runtime;
+
+namespace Amazon.S3.Model
+{
+    /// <summary>
+    /// Returns information about the  ListVersions response and response metadata.
+    /// </summary>
+    public class ListVersionsResponse : AmazonWebServiceResponse
+    {
+
+        private bool? isTruncated;
+        private string keyMarker;
+        private string versionIdMarker;
+        private string nextKeyMarker;
+        private string nextVersionIdMarker;
+        private List<S3ObjectVersion> versions = AWSConfigs.InitializeCollections ? new List<S3ObjectVersion>() : null;
+        private string name;
+        private string prefix;
+        private int? maxKeys;
+        private List<string> commonPrefixes = AWSConfigs.InitializeCollections ? new List<string>() : null;
+        private string delimiter;
+        private RequestCharged _requestCharged;
+
+        /// <summary>
+        /// Gets and sets the property IsTruncated. 
+        /// <para>
+        /// A flag that indicates whether Amazon S3 returned all of the results that satisfied
+        /// the search criteria. If your results were truncated, you can make a follow-up paginated
+        /// request by using the <code>NextKeyMarker</code> and <code>NextVersionIdMarker</code>
+        /// response parameters as a starting place in another request to return the rest of the
+        /// results.
+        /// </para>
+        /// </summary>
+        public bool? IsTruncated
+        {
+            get { return this.isTruncated; }
+            set { this.isTruncated = value; }
+        }
+
+        // Check to see if IsTruncated property is set
+        internal bool IsSetIsTruncated()
+        {
+            return this.isTruncated.HasValue;
+        }
+
+        /// <summary>
+        /// Marks the last Key returned in a truncated response.
+        ///  
+        /// </summary>
+        public string KeyMarker
+        {
+            get { return this.keyMarker; }
+            set { this.keyMarker = value; }
+        }
+
+        // Check to see if KeyMarker property is set
+        internal bool IsSetKeyMarker()
+        {
+            return this.keyMarker != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the VersionIdMarker property.
+        /// Marks the last Version-Id returned in a truncated response.
+        /// </summary>
+        public string VersionIdMarker
+        {
+            get { return this.versionIdMarker; }
+            set { this.versionIdMarker = value; }
+        }
+
+        // Check to see if VersionIdMarker property is set
+        internal bool IsSetVersionIdMarker()
+        {
+            return this.versionIdMarker != null;
+        }
+
+        /// <summary>
+        /// Use this value for the key marker request parameter in a subsequent request.
+        ///  
+        /// </summary>
+        public string NextKeyMarker
+        {
+            get { return this.nextKeyMarker; }
+            set { this.nextKeyMarker = value; }
+        }
+
+        // Check to see if NextKeyMarker property is set
+        internal bool IsSetNextKeyMarker()
+        {
+            return this.nextKeyMarker != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property NextVersionIdMarker. 
+        /// <para>
+        /// When the number of responses exceeds the value of <code>MaxKeys</code>, <code>NextVersionIdMarker</code>
+        /// specifies the first object version not returned that satisfies the search criteria.
+        /// Use this value for the <code>version-id-marker</code> request parameter in a subsequent
+        /// request.
+        /// </para>
+        /// </summary>
+        public string NextVersionIdMarker
+        {
+            get { return this.nextVersionIdMarker; }
+            set { this.nextVersionIdMarker = value; }
+        }
+
+        // Check to see if NextVersionIdMarker property is set
+        internal bool IsSetNextVersionIdMarker()
+        {
+            return this.nextVersionIdMarker != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the Versions property. This is a list of 
+        /// object versions in the bucket that match your search criteria.
+        /// </summary>
+        public List<S3ObjectVersion> Versions
+        {
+            get { return this.versions; }
+            set { this.versions = value; }
+        }
+
+        // Check to see if Versions property is set
+        internal bool IsSetVersions()
+        {
+            return this.versions != null && (this.versions.Count > 0 || !AWSConfigs.InitializeCollections);
+        }
+
+        /// <summary>
+        /// <para>The bucket name.</para>
+        /// </summary>
+        public string Name
+        {
+            get { return this.name; }
+            set { this.name = value; }
+        }
+
+        // Check to see if Name property is set
+        internal bool IsSetName()
+        {
+            return this.name != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the Prefix property.
+        /// Keys that begin with the indicated prefix are listed.
+        /// </summary>
+        public string Prefix
+        {
+            get { return this.prefix; }
+            set { this.prefix = value; }
+        }
+
+        // Check to see if Prefix property is set
+        internal bool IsSetPrefix()
+        {
+            return this.prefix != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property RequestCharged.
+        /// </summary>
+        public RequestCharged RequestCharged
+        {
+            get { return this._requestCharged; }
+            set { this._requestCharged = value; }
+        }
+
+        // Check to see if RequestCharged property is set
+        internal bool IsSetRequestCharged()
+        {
+            return this._requestCharged != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the MaxKeys property.
+        /// This is the maximum number of keys in the S3ObjectVersions collection.
+        /// The value is derived from the MaxKeys parameter to ListVersionsRequest.
+        /// </summary>
+        public int? MaxKeys
+        {
+            get { return this.maxKeys; }
+            set { this.maxKeys = value; }
+        }
+
+        // Check to see if MaxKeys property is set
+        internal bool IsSetMaxKeys()
+        {
+            return this.maxKeys.HasValue;
+        }
+
+        /// <summary>
+        /// Gets the CommonPrefixes property. 
+        /// A response can contain CommonPrefixes only if you specify a delimiter. 
+        /// When you do, CommonPrefixes contains all (if there are any) keys between 
+        /// Prefix and the next occurrence of the string specified by delimiter.
+        /// </summary>
+        public List<string> CommonPrefixes
+        {
+            get { return this.commonPrefixes; }
+            set { this.commonPrefixes = value; }
+        }
+
+        // Check to see if CommonPrefixes property is set
+        internal bool IsSetCommonPrefixes()
+        {
+            return this.commonPrefixes != null && (this.commonPrefixes.Count > 0 || !AWSConfigs.InitializeCollections);
+        }
+
+        /// <summary>
+        /// Gets and sets the Delimiter property.
+        /// <para>
+        /// The delimiter grouping the included keys. A delimiter is a character that you specify
+        /// to group keys. All keys that contain the same string between the prefix and the first
+        /// occurrence of the delimiter are grouped under a single result element in <code>CommonPrefixes</code>.
+        /// These groups are counted as one result against the <code>max-keys</code> limitation.
+        /// These keys are not returned elsewhere in the response.
+        /// </para>
+        /// </summary>
+        /// <remarks>
+        /// These rolled-up keys are not returned elsewhere in the response.
+        /// </remarks>
+        public string Delimiter
+        {
+            get { return this.delimiter; }
+            set { this.delimiter = value; }
+        }
+    }
+}
+    
diff --git a/sdk/src/Services/S3/Generated/Model/PutBucketAclRequest.cs b/sdk/src/Services/S3/Custom/Model/PutBucketACLRequest.cs
similarity index 88%
rename from sdk/src/Services/S3/Generated/Model/PutBucketAclRequest.cs
rename to sdk/src/Services/S3/Custom/Model/PutBucketACLRequest.cs
index c16f6bb6eb2b..910fe7fa3b8e 100644
--- a/sdk/src/Services/S3/Generated/Model/PutBucketAclRequest.cs
+++ b/sdk/src/Services/S3/Custom/Model/PutBucketACLRequest.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License").
@@ -13,9 +13,7 @@
  * permissions and limitations under the License.
  */
 
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
+
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
@@ -31,24 +29,9 @@ namespace Amazon.S3.Model
 {
     /// <summary>
     /// Container for the parameters to the PutBucketAcl operation.
-    /// <important> 
-    /// <para>
-    /// End of support notice: Beginning October 1, 2025, Amazon S3 will discontinue support
-    /// for creating new Email Grantee Access Control Lists (ACL). Email Grantee ACLs created
-    /// prior to this date will continue to work and remain accessible through the Amazon
-    /// Web Services Management Console, Command Line Interface (CLI), SDKs, and REST API.
-    /// However, you will no longer be able to create new Email Grantee ACLs. 
-    /// </para>
-    ///  
-    /// <para>
-    /// This change affects the following Amazon Web Services Regions: US East (N. Virginia)
-    /// Region, US West (N. California) Region, US West (Oregon) Region, Asia Pacific (Singapore)
-    /// Region, Asia Pacific (Sydney) Region, Asia Pacific (Tokyo) Region, Europe (Ireland)
-    /// Region, and South America (São Paulo) Region.
-    /// </para>
-    ///  </important> <note> 
+    /// <note> 
     /// <para>
-    /// This operation is not supported for directory buckets.
+    /// This operation is not supported by directory buckets.
     /// </para>
     ///  </note> 
     /// <para>
@@ -191,9 +174,7 @@ namespace Amazon.S3.Model
     ///  </dd> <dt>Grantee Values</dt> <dd> 
     /// <para>
     /// You can specify the person (grantee) to whom you're assigning access rights (using
-    /// request elements) in the following ways. For examples of how to specify these grantee
-    /// values in JSON format, see the Amazon Web Services CLI example in <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/enable-server-access-logging.html">
-    /// Enabling Amazon S3 server access logging</a> in the <i>Amazon S3 User Guide</i>.
+    /// request elements) in the following ways:
     /// </para>
     ///  <ul> <li> 
     /// <para>
@@ -341,7 +322,7 @@ public S3CannedACL ACL
         // Check to see if ACL property is set
         internal bool IsSetACL()
         {
-            return this._acl != null;
+            return !string.IsNullOrEmpty(this._acl);
         }
 
         /// <summary>
@@ -365,7 +346,7 @@ internal bool IsSetBucketName()
         /// <summary>
         /// Gets and sets the property ChecksumAlgorithm. 
         /// <para>
-        /// Indicates the algorithm used to create the checksum for the request when you use the
+        /// Indicates the algorithm used to create the checksum for the object when you use the
         /// SDK. This header will not provide any additional functionality if you don't use the
         /// SDK. When you send this header, there must be a corresponding <c>x-amz-checksum</c>
         /// or <c>x-amz-trailer</c> header sent. Otherwise, Amazon S3 fails the request with the
@@ -387,16 +368,16 @@ public ChecksumAlgorithm ChecksumAlgorithm
         // Check to see if ChecksumAlgorithm property is set
         internal bool IsSetChecksumAlgorithm()
         {
-            return this._checksumAlgorithm != null;
+            return !string.IsNullOrEmpty(this._checksumAlgorithm);
         }
 
         /// <summary>
         /// Gets and sets the property ContentMD5. 
         /// <para>
-        /// The Base64 encoded 128-bit <c>MD5</c> digest of the data. This header must be used
-        /// as a message integrity check to verify that the request body was not corrupted in
-        /// transit. For more information, go to <a href="http://www.ietf.org/rfc/rfc1864.txt">RFC
-        /// 1864.</a> 
+        /// The base64-encoded 128-bit MD5 digest of the data. This header must be used as a message
+        /// integrity check to verify that the request body was not corrupted in transit. For
+        /// more information, go to <a href="http://www.ietf.org/rfc/rfc1864.txt">RFC 1864.</a>
+        /// 
         /// </para>
         ///  
         /// <para>
@@ -413,7 +394,7 @@ public string ContentMD5
         // Check to see if ContentMD5 property is set
         internal bool IsSetContentMD5()
         {
-            return this._contentMD5 != null;
+            return !string.IsNullOrEmpty(this._contentMD5);
         }
 
         /// <summary>
@@ -433,7 +414,7 @@ public string ExpectedBucketOwner
         // Check to see if ExpectedBucketOwner property is set
         internal bool IsSetExpectedBucketOwner()
         {
-            return this._expectedBucketOwner != null;
+            return !string.IsNullOrEmpty(this._expectedBucketOwner);
         }
 
         /// <summary>
@@ -451,7 +432,7 @@ public string GrantFullControl
         // Check to see if GrantFullControl property is set
         internal bool IsSetGrantFullControl()
         {
-            return this._grantFullControl != null;
+            return !string.IsNullOrEmpty(this._grantFullControl);
         }
 
         /// <summary>
@@ -469,7 +450,7 @@ public string GrantRead
         // Check to see if GrantRead property is set
         internal bool IsSetGrantRead()
         {
-            return this._grantRead != null;
+            return !string.IsNullOrEmpty(this._grantRead);
         }
 
         /// <summary>
@@ -487,7 +468,7 @@ public string GrantReadACP
         // Check to see if GrantReadACP property is set
         internal bool IsSetGrantReadACP()
         {
-            return this._grantReadACP != null;
+            return !string.IsNullOrEmpty(this._grantReadACP);
         }
 
         /// <summary>
@@ -510,7 +491,7 @@ public string GrantWrite
         // Check to see if GrantWrite property is set
         internal bool IsSetGrantWrite()
         {
-            return this._grantWrite != null;
+            return !string.IsNullOrEmpty(this._grantWrite);
         }
 
         /// <summary>
@@ -528,7 +509,7 @@ public string GrantWriteACP
         // Check to see if GrantWriteACP property is set
         internal bool IsSetGrantWriteACP()
         {
-            return this._grantWriteACP != null;
+            return !string.IsNullOrEmpty(this._grantWriteACP);
         }
 
     }
diff --git a/sdk/src/Services/S3/Generated/Model/PutBucketAclResponse.cs b/sdk/src/Services/S3/Custom/Model/PutBucketACLResponse.cs
similarity index 90%
rename from sdk/src/Services/S3/Generated/Model/PutBucketAclResponse.cs
rename to sdk/src/Services/S3/Custom/Model/PutBucketACLResponse.cs
index f7f2e2c690e7..16d6b9a5c910 100644
--- a/sdk/src/Services/S3/Generated/Model/PutBucketAclResponse.cs
+++ b/sdk/src/Services/S3/Custom/Model/PutBucketACLResponse.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License").
@@ -13,9 +13,6 @@
  * permissions and limitations under the License.
  */
 
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
diff --git a/sdk/src/Services/S3/Generated/Model/PutCORSConfigurationRequest.cs b/sdk/src/Services/S3/Custom/Model/PutCORSConfigurationRequest.cs
similarity index 53%
rename from sdk/src/Services/S3/Generated/Model/PutCORSConfigurationRequest.cs
rename to sdk/src/Services/S3/Custom/Model/PutCORSConfigurationRequest.cs
index a4dfec61f9ec..5691986dae17 100644
--- a/sdk/src/Services/S3/Generated/Model/PutCORSConfigurationRequest.cs
+++ b/sdk/src/Services/S3/Custom/Model/PutCORSConfigurationRequest.cs
@@ -12,74 +12,69 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
 using System.Text;
 using System.IO;
-using System.Net;
 
 using Amazon.Runtime;
 using Amazon.Runtime.Internal;
 
-#pragma warning disable CS0612,CS0618,CS1570
 namespace Amazon.S3.Model
 {
     /// <summary>
     /// Container for the parameters to the PutCORSConfiguration operation.
     /// <note> 
     /// <para>
-    /// This operation is not supported for directory buckets.
+    /// This operation is not supported by directory buckets.
     /// </para>
     ///  </note> 
     /// <para>
-    /// Sets the <c>cors</c> configuration for your bucket. If the configuration exists, Amazon
-    /// S3 replaces it.
+    /// Sets the <code>cors</code> configuration for your bucket. If the configuration exists,
+    /// Amazon S3 replaces it.
     /// </para>
     ///  
     /// <para>
-    /// To use this operation, you must be allowed to perform the <c>s3:PutBucketCORS</c>
+    /// To use this operation, you must be allowed to perform the <code>s3:PutBucketCORS</code>
     /// action. By default, the bucket owner has this permission and can grant it to others.
     /// </para>
     ///  
     /// <para>
     /// You set this configuration on a bucket so that the bucket can service cross-origin
-    /// requests. For example, you might want to enable a request whose origin is <c>http://www.example.com</c>
-    /// to access your Amazon S3 bucket at <c>my.example.bucket.com</c> by using the browser's
-    /// <c>XMLHttpRequest</c> capability.
+    /// requests. For example, you might want to enable a request whose origin is <code>http://www.example.com</code>
+    /// to access your Amazon S3 bucket at <code>amzn-s3-demo-bucket</code> by using the
+    /// browser's <code>XMLHttpRequest</code> capability.
     /// </para>
     ///  
     /// <para>
-    /// To enable cross-origin resource sharing (CORS) on a bucket, you add the <c>cors</c>
-    /// subresource to the bucket. The <c>cors</c> subresource is an XML document in which
-    /// you configure rules that identify origins and the HTTP methods that can be executed
+    /// To enable cross-origin resource sharing (CORS) on a bucket, you add the <code>cors</code>
+    /// subresource to the bucket. The <code>cors</code> subresource is an XML document in
+    /// which you configure rules that identify origins and the HTTP methods that can be executed
     /// on your bucket. The document is limited to 64 KB in size. 
     /// </para>
     ///  
     /// <para>
     /// When Amazon S3 receives a cross-origin request (or a pre-flight OPTIONS request) against
-    /// a bucket, it evaluates the <c>cors</c> configuration on the bucket and uses the first
-    /// <c>CORSRule</c> rule that matches the incoming browser request to enable a cross-origin
-    /// request. For a rule to match, the following conditions must be met:
+    /// a bucket, it evaluates the <code>cors</code> configuration on the bucket and uses
+    /// the first <code>CORSRule</code> rule that matches the incoming browser request to
+    /// enable a cross-origin request. For a rule to match, the following conditions must
+    /// be met:
     /// </para>
     ///  <ul> <li> 
     /// <para>
-    /// The request's <c>Origin</c> header must match <c>AllowedOrigin</c> elements.
+    /// The request's <code>Origin</code> header must match <code>AllowedOrigin</code> elements.
     /// </para>
     ///  </li> <li> 
     /// <para>
-    /// The request method (for example, GET, PUT, HEAD, and so on) or the <c>Access-Control-Request-Method</c>
-    /// header in case of a pre-flight <c>OPTIONS</c> request must be one of the <c>AllowedMethod</c>
+    /// The request method (for example, GET, PUT, HEAD, and so on) or the <code>Access-Control-Request-Method</code>
+    /// header in case of a pre-flight <code>OPTIONS</code> request must be one of the <code>AllowedMethod</code>
     /// elements. 
     /// </para>
     ///  </li> <li> 
     /// <para>
-    /// Every header specified in the <c>Access-Control-Request-Headers</c> request header
-    /// of a pre-flight request must match an <c>AllowedHeader</c> element. 
+    /// Every header specified in the <code>Access-Control-Request-Headers</code> request
+    /// header of a pre-flight request must match an <code>AllowedHeader</code> element. 
     /// </para>
     ///  </li> </ul> 
     /// <para>
@@ -88,7 +83,7 @@ namespace Amazon.S3.Model
     /// </para>
     ///  
     /// <para>
-    /// The following operations are related to <c>PutBucketCors</c>:
+    /// The following operations are related to <code>PutBucketCors</code>:
     /// </para>
     ///  <ul> <li> 
     /// <para>
@@ -109,43 +104,40 @@ namespace Amazon.S3.Model
     /// </summary>
     public partial class PutCORSConfigurationRequest : AmazonWebServiceRequest
     {
-        private string _bucketName;
+        private string bucketName;
         private ChecksumAlgorithm _checksumAlgorithm;
-        private CORSConfiguration _configuration;
-        private string _contentMD5;
-        private string _expectedBucketOwner;
+        private CORSConfiguration configuration;
+        private string expectedBucketOwner;
 
         /// <summary>
-        /// Gets and sets the property BucketName. 
-        /// <para>
-        /// Specifies the bucket impacted by the <c>cors</c>configuration.
-        /// </para>
+        /// The name of the bucket to have the CORS configuration applied.
         /// </summary>
         public string BucketName
         {
-            get { return this._bucketName; }
-            set { this._bucketName = value; }
+            get { return this.bucketName; }
+            set { this.bucketName = value; }
         }
 
         // Check to see if BucketName property is set
         internal bool IsSetBucketName()
         {
-            return this._bucketName != null;
+            return this.bucketName != null;
         }
 
         /// <summary>
         /// Gets and sets the property ChecksumAlgorithm. 
         /// <para>
-        /// Indicates the algorithm used to create the checksum for the request when you use the
+        /// Indicates the algorithm used to create the checksum for the object when you use the
         /// SDK. This header will not provide any additional functionality if you don't use the
-        /// SDK. When you send this header, there must be a corresponding <c>x-amz-checksum</c>
-        /// or <c>x-amz-trailer</c> header sent. Otherwise, Amazon S3 fails the request with the
-        /// HTTP status code <c>400 Bad Request</c>. For more information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html">Checking
+        /// SDK. When you send this header, there must be a corresponding <code>x-amz-checksum</code>
+        /// or <code>x-amz-trailer</code> header sent. Otherwise, Amazon S3 fails the request
+        /// with the HTTP status code <code>400 Bad Request</code>. For more information, see
+        /// <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html">Checking
         /// object integrity</a> in the <i>Amazon S3 User Guide</i>.
         /// </para>
         ///  
         /// <para>
-        /// If you provide an individual checksum, Amazon S3 ignores any provided <c>ChecksumAlgorithm</c>
+        /// If you provide an individual checksum, Amazon S3 ignores any provided <code>ChecksumAlgorithm</code>
         /// parameter.
         /// </para>
         /// </summary>
@@ -162,49 +154,18 @@ internal bool IsSetChecksumAlgorithm()
         }
 
         /// <summary>
-        /// Gets and sets the property Configuration. 
-        /// <para>
-        /// Describes the cross-origin access configuration for objects in an Amazon S3 bucket.
-        /// For more information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/dev/cors.html">Enabling
-        /// Cross-Origin Resource Sharing</a> in the <i>Amazon S3 User Guide</i>.
-        /// </para>
+        /// The CORS configuration to apply.
         /// </summary>
         public CORSConfiguration Configuration
         {
-            get { return this._configuration; }
-            set { this._configuration = value; }
+            get { return this.configuration; }
+            set { this.configuration = value; }
         }
 
         // Check to see if Configuration property is set
         internal bool IsSetConfiguration()
         {
-            return this._configuration != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ContentMD5. 
-        /// <para>
-        /// The Base64 encoded 128-bit <c>MD5</c> digest of the data. This header must be used
-        /// as a message integrity check to verify that the request body was not corrupted in
-        /// transit. For more information, go to <a href="http://www.ietf.org/rfc/rfc1864.txt">RFC
-        /// 1864.</a> 
-        /// </para>
-        ///  
-        /// <para>
-        /// For requests made using the Amazon Web Services Command Line Interface (CLI) or Amazon
-        /// Web Services SDKs, this field is calculated automatically.
-        /// </para>
-        /// </summary>
-        public string ContentMD5
-        {
-            get { return this._contentMD5; }
-            set { this._contentMD5 = value; }
-        }
-
-        // Check to see if ContentMD5 property is set
-        internal bool IsSetContentMD5()
-        {
-            return this._contentMD5 != null;
+            return this.configuration != null;
         }
 
         /// <summary>
@@ -212,20 +173,24 @@ internal bool IsSetContentMD5()
         /// <para>
         /// The account ID of the expected bucket owner. If the account ID that you provide does
         /// not match the actual owner of the bucket, the request fails with the HTTP status code
-        /// <c>403 Forbidden</c> (access denied).
+        /// <code>403 Forbidden</code> (access denied).
         /// </para>
         /// </summary>
         public string ExpectedBucketOwner
         {
-            get { return this._expectedBucketOwner; }
-            set { this._expectedBucketOwner = value; }
+            get { return this.expectedBucketOwner; }
+            set { this.expectedBucketOwner = value; }
         }
 
-        // Check to see if ExpectedBucketOwner property is set
+        /// <summary>
+        /// Checks to see if ExpectedBucketOwner is set.
+        /// </summary>
+        /// <returns>true, if ExpectedBucketOwner property is set.</returns>
         internal bool IsSetExpectedBucketOwner()
         {
-            return this._expectedBucketOwner != null;
+            return !String.IsNullOrEmpty(this.expectedBucketOwner);
         }
 
     }
-}
\ No newline at end of file
+}
+    
diff --git a/sdk/src/Services/S3/Generated/Model/PutCORSConfigurationResponse.cs b/sdk/src/Services/S3/Custom/Model/PutCORSConfigurationResponse.cs
similarity index 74%
rename from sdk/src/Services/S3/Generated/Model/PutCORSConfigurationResponse.cs
rename to sdk/src/Services/S3/Custom/Model/PutCORSConfigurationResponse.cs
index cb46decd30ca..c05b1542e9f2 100644
--- a/sdk/src/Services/S3/Generated/Model/PutCORSConfigurationResponse.cs
+++ b/sdk/src/Services/S3/Custom/Model/PutCORSConfigurationResponse.cs
@@ -12,28 +12,21 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
 using System.Text;
-using System.IO;
-using System.Net;
 
 using Amazon.Runtime;
-using Amazon.Runtime.Internal;
 
-#pragma warning disable CS0612,CS0618,CS1570
 namespace Amazon.S3.Model
 {
     /// <summary>
-    /// This is the response object from the PutCORSConfiguration operation.
+    /// Returns information about the PutCORSConfiguration response metadata.
+    /// The PutCORSConfiguration operation has a void result type.
     /// </summary>
     public partial class PutCORSConfigurationResponse : AmazonWebServiceResponse
     {
-
     }
-}
\ No newline at end of file
+}
+    
diff --git a/sdk/src/Services/S3/Generated/Model/PutObjectAclRequest.cs b/sdk/src/Services/S3/Custom/Model/PutObjectACLRequest.cs
similarity index 89%
rename from sdk/src/Services/S3/Generated/Model/PutObjectAclRequest.cs
rename to sdk/src/Services/S3/Custom/Model/PutObjectACLRequest.cs
index e61d24d39e98..260262e74405 100644
--- a/sdk/src/Services/S3/Generated/Model/PutObjectAclRequest.cs
+++ b/sdk/src/Services/S3/Custom/Model/PutObjectACLRequest.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License").
@@ -13,9 +13,6 @@
  * permissions and limitations under the License.
  */
 
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
@@ -33,7 +30,7 @@ namespace Amazon.S3.Model
     /// Container for the parameters to the PutObjectAcl operation.
     /// <note> 
     /// <para>
-    /// This operation is not supported for directory buckets.
+    /// This operation is not supported by directory buckets.
     /// </para>
     ///  </note> 
     /// <para>
@@ -165,9 +162,7 @@ namespace Amazon.S3.Model
     ///  </dd> <dt>Grantee Values</dt> <dd> 
     /// <para>
     /// You can specify the person (grantee) to whom you're assigning access rights (using
-    /// request elements) in the following ways. For examples of how to specify these grantee
-    /// values in JSON format, see the Amazon Web Services CLI example in <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/enable-server-access-logging.html">
-    /// Enabling Amazon S3 server access logging</a> in the <i>Amazon S3 User Guide</i>.
+    /// request elements) in the following ways:
     /// </para>
     ///  <ul> <li> 
     /// <para>
@@ -330,11 +325,9 @@ internal bool IsSetACL()
         /// </para>
         ///  
         /// <para>
-        ///  <b>Access points</b> - When you use this action with an access point for general
-        /// purpose buckets, you must provide the alias of the access point in place of the bucket
-        /// name or specify the access point ARN. When you use this action with an access point
-        /// for directory buckets, you must provide the access point name in place of the bucket
-        /// name. When using the access point ARN, you must direct requests to the access point
+        ///  <b>Access points</b> - When you use this action with an access point, you must provide
+        /// the alias of the access point in place of the bucket name or specify the access point
+        /// ARN. When using the access point ARN, you must direct requests to the access point
         /// hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com.
         /// When using this action with an access point through the Amazon Web Services SDKs,
         /// you provide the access point ARN in place of the bucket name. For more information
@@ -343,12 +336,12 @@ internal bool IsSetACL()
         /// </para>
         ///  
         /// <para>
-        ///  <b>S3 on Outposts</b> - When you use this action with S3 on Outposts, you must direct
-        /// requests to the S3 on Outposts hostname. The S3 on Outposts hostname takes the form
-        /// <c> <i>AccessPointName</i>-<i>AccountId</i>.<i>outpostID</i>.s3-outposts.<i>Region</i>.amazonaws.com</c>.
-        /// When you use this action with S3 on Outposts, the destination bucket must be the Outposts
-        /// access point ARN or the access point alias. For more information about S3 on Outposts,
-        /// see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html">What
+        ///  <b>S3 on Outposts</b> - When you use this action with Amazon S3 on Outposts, you
+        /// must direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname takes
+        /// the form <c> <i>AccessPointName</i>-<i>AccountId</i>.<i>outpostID</i>.s3-outposts.<i>Region</i>.amazonaws.com</c>.
+        /// When you use this action with S3 on Outposts through the Amazon Web Services SDKs,
+        /// you provide the Outposts access point ARN in place of the bucket name. For more information
+        /// about S3 on Outposts ARNs, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html">What
         /// is S3 on Outposts?</a> in the <i>Amazon S3 User Guide</i>.
         /// </para>
         /// </summary>
@@ -389,16 +382,16 @@ public ChecksumAlgorithm ChecksumAlgorithm
         // Check to see if ChecksumAlgorithm property is set
         internal bool IsSetChecksumAlgorithm()
         {
-            return this._checksumAlgorithm != null;
+            return !string.IsNullOrEmpty(this._checksumAlgorithm);
         }
 
         /// <summary>
         /// Gets and sets the property ContentMD5. 
         /// <para>
-        /// The Base64 encoded 128-bit <c>MD5</c> digest of the data. This header must be used
-        /// as a message integrity check to verify that the request body was not corrupted in
-        /// transit. For more information, go to <a href="http://www.ietf.org/rfc/rfc1864.txt">RFC
-        /// 1864.&gt;</a> 
+        /// The base64-encoded 128-bit MD5 digest of the data. This header must be used as a message
+        /// integrity check to verify that the request body was not corrupted in transit. For
+        /// more information, go to <a href="http://www.ietf.org/rfc/rfc1864.txt">RFC 1864.&gt;</a>
+        /// 
         /// </para>
         ///  
         /// <para>
@@ -415,7 +408,7 @@ public string ContentMD5
         // Check to see if ContentMD5 property is set
         internal bool IsSetContentMD5()
         {
-            return this._contentMD5 != null;
+            return !string.IsNullOrEmpty(this._contentMD5);
         }
 
         /// <summary>
@@ -435,7 +428,7 @@ public string ExpectedBucketOwner
         // Check to see if ExpectedBucketOwner property is set
         internal bool IsSetExpectedBucketOwner()
         {
-            return this._expectedBucketOwner != null;
+            return !string.IsNullOrEmpty(this._expectedBucketOwner);
         }
 
         /// <summary>
@@ -457,7 +450,7 @@ public string GrantFullControl
         // Check to see if GrantFullControl property is set
         internal bool IsSetGrantFullControl()
         {
-            return this._grantFullControl != null;
+            return !string.IsNullOrEmpty(this._grantFullControl);
         }
 
         /// <summary>
@@ -479,7 +472,7 @@ public string GrantRead
         // Check to see if GrantRead property is set
         internal bool IsSetGrantRead()
         {
-            return this._grantRead != null;
+            return !string.IsNullOrEmpty(this._grantRead);
         }
 
         /// <summary>
@@ -501,7 +494,7 @@ public string GrantReadACP
         // Check to see if GrantReadACP property is set
         internal bool IsSetGrantReadACP()
         {
-            return this._grantReadACP != null;
+            return !string.IsNullOrEmpty(this._grantReadACP);
         }
 
         /// <summary>
@@ -524,7 +517,7 @@ public string GrantWrite
         // Check to see if GrantWrite property is set
         internal bool IsSetGrantWrite()
         {
-            return this._grantWrite != null;
+            return !string.IsNullOrEmpty(this._grantWrite);
         }
 
         /// <summary>
@@ -546,7 +539,7 @@ public string GrantWriteACP
         // Check to see if GrantWriteACP property is set
         internal bool IsSetGrantWriteACP()
         {
-            return this._grantWriteACP != null;
+            return !string.IsNullOrEmpty(this._grantWriteACP);
         }
 
         /// <summary>
@@ -555,7 +548,7 @@ internal bool IsSetGrantWriteACP()
         /// Key for which the PUT action was initiated.
         /// </para>
         /// </summary>
-        [AWSProperty(Required=true, Min=1)]
+        [AWSProperty(Required = true, Min = 1)]
         public string Key
         {
             get { return this._key; }
@@ -580,7 +573,7 @@ public RequestPayer RequestPayer
         // Check to see if RequestPayer property is set
         internal bool IsSetRequestPayer()
         {
-            return this._requestPayer != null;
+            return !string.IsNullOrEmpty(this._requestPayer);
         }
 
         /// <summary>
diff --git a/sdk/src/Services/S3/Generated/Model/PutObjectAclResponse.cs b/sdk/src/Services/S3/Custom/Model/PutObjectACLResponse.cs
similarity index 90%
rename from sdk/src/Services/S3/Generated/Model/PutObjectAclResponse.cs
rename to sdk/src/Services/S3/Custom/Model/PutObjectACLResponse.cs
index f2c2c46c60ed..e4577fa1fdc3 100644
--- a/sdk/src/Services/S3/Generated/Model/PutObjectAclResponse.cs
+++ b/sdk/src/Services/S3/Custom/Model/PutObjectACLResponse.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License").
@@ -13,9 +13,6 @@
  * permissions and limitations under the License.
  */
 
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
@@ -48,7 +45,7 @@ public RequestCharged RequestCharged
         // Check to see if RequestCharged property is set
         internal bool IsSetRequestCharged()
         {
-            return this._requestCharged != null;
+            return !string.IsNullOrEmpty(this._requestCharged);
         }
 
     }
diff --git a/sdk/src/Services/S3/Generated/Model/RestoreStatus.cs b/sdk/src/Services/S3/Custom/Model/RestoreStatus.cs
similarity index 59%
rename from sdk/src/Services/S3/Generated/Model/RestoreStatus.cs
rename to sdk/src/Services/S3/Custom/Model/RestoreStatus.cs
index a87e6f5613aa..96de2d234ffe 100644
--- a/sdk/src/Services/S3/Generated/Model/RestoreStatus.cs
+++ b/sdk/src/Services/S3/Custom/Model/RestoreStatus.cs
@@ -1,32 +1,9 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
+using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
 using System.Text;
 using System.IO;
-using System.Net;
-
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
 
-#pragma warning disable CS0612,CS0618,CS1570
 namespace Amazon.S3.Model
 {
     /// <summary>
@@ -37,14 +14,12 @@ namespace Amazon.S3.Model
     /// 
     ///  <note> 
     /// <para>
-    /// This functionality is not supported for directory buckets. Directory buckets only
-    /// support <c>EXPRESS_ONEZONE</c> (the S3 Express One Zone storage class) in Availability
-    /// Zones and <c>ONEZONE_IA</c> (the S3 One Zone-Infrequent Access storage class) in Dedicated
-    /// Local Zones.
+    /// This functionality is not supported for directory buckets. Only the S3 Express One
+    /// Zone storage class is supported by directory buckets to store objects.
     /// </para>
     ///  </note>
     /// </summary>
-    public partial class RestoreStatus
+    public class RestoreStatus
     {
         private bool? _isRestoreInProgress;
         private DateTime? _restoreExpiryDate;
@@ -53,20 +28,20 @@ public partial class RestoreStatus
         /// Gets and sets the property IsRestoreInProgress. 
         /// <para>
         /// Specifies whether the object is currently being restored. If the object restoration
-        /// is in progress, the header returns the value <c>TRUE</c>. For example:
+        /// is in progress, the header returns the value <code>TRUE</code>. For example:
         /// </para>
         ///  
         /// <para>
-        ///  <c>x-amz-optional-object-attributes: IsRestoreInProgress="true"</c> 
+        ///  <code>x-amz-optional-object-attributes: IsRestoreInProgress="true"</code> 
         /// </para>
         ///  
         /// <para>
-        /// If the object restoration has completed, the header returns the value <c>FALSE</c>.
+        /// If the object restoration has completed, the header returns the value <code>FALSE</code>.
         /// For example:
         /// </para>
         ///  
         /// <para>
-        ///  <c>x-amz-optional-object-attributes: IsRestoreInProgress="false", RestoreExpiryDate="2012-12-21T00:00:00.000Z"</c>
+        ///  <code>x-amz-optional-object-attributes: IsRestoreInProgress="false", RestoreExpiryDate="2012-12-21T00:00:00.000Z"</code>
         /// 
         /// </para>
         ///  
@@ -83,7 +58,7 @@ public bool? IsRestoreInProgress
         // Check to see if IsRestoreInProgress property is set
         internal bool IsSetIsRestoreInProgress()
         {
-            return this._isRestoreInProgress.HasValue; 
+            return this._isRestoreInProgress.HasValue;
         }
 
         /// <summary>
@@ -94,7 +69,7 @@ internal bool IsSetIsRestoreInProgress()
         /// </para>
         ///  
         /// <para>
-        ///  <c>x-amz-optional-object-attributes: IsRestoreInProgress="false", RestoreExpiryDate="2012-12-21T00:00:00.000Z"</c>
+        ///  <code>x-amz-optional-object-attributes: IsRestoreInProgress="false", RestoreExpiryDate="2012-12-21T00:00:00.000Z"</code>
         /// 
         /// </para>
         /// </summary>
@@ -107,8 +82,8 @@ public DateTime? RestoreExpiryDate
         // Check to see if RestoreExpiryDate property is set
         internal bool IsSetRestoreExpiryDate()
         {
-            return this._restoreExpiryDate.HasValue; 
+            return this._restoreExpiryDate.HasValue;
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/sdk/src/Services/S3/Custom/Model/S3AccessControlList.cs b/sdk/src/Services/S3/Custom/Model/S3AccessControlList.cs
index e38c9337b97c..7d4cb73e4c1e 100644
--- a/sdk/src/Services/S3/Custom/Model/S3AccessControlList.cs
+++ b/sdk/src/Services/S3/Custom/Model/S3AccessControlList.cs
@@ -39,8 +39,10 @@ namespace Amazon.S3.Model
     /// buckets as you will have no control over the objects others can store and their associated charges.
     /// For more information, see Grantees and Permissions</para>
     /// </remarks>
-    public partial class S3AccessControlList
+    public class S3AccessControlList
     {
+        private List<S3Grant> grantList = AWSConfigs.InitializeCollections ? new List<S3Grant>() : null;
+
         /// <summary>
         /// Creates a S3Grant and adds it to the list of grants.
         /// </summary>
@@ -128,12 +130,59 @@ public void RemoveGrant(S3Grantee grantee)
         //    this.Grants.Sort(new ComparatorGrant());
         //}
 
+        /// <summary>
+        /// The owner of the bucket or object.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Every bucket and object in Amazon S3 has an owner, the user that
+        /// created the bucket or object. The owner of a bucket or object cannot
+        /// be changed. However, if the object is overwritten by another user
+        /// (deleted and rewritten), the new object will have a new owner.
+        /// </para>
+        /// <para>
+        /// Note: Even the owner is subject to the ACL. For example, if an owner
+        /// does not have Permission.READ access to an object, the owner cannot read
+        /// that object. However, the owner of an object always has write access to the
+        /// access control policy (Permission.WriteAcp) and can change the ACL to
+        /// read the object.
+        /// </para>
+        /// </remarks>
+        public Owner Owner { get; set; }
+
+        /// <summary>
+        /// Checks if Owner property is set.
+        /// </summary>
+        /// <returns>true if Owner property is set.</returns>
+        internal bool IsSetOwner()
+        {
+            return this.Owner != null;
+        }
+
+        /// <summary>
+        /// A collection of grants.
+        /// </summary>
+        public List<S3Grant> Grants
+        {
+            get {  return this.grantList; }
+            set { this.grantList = value; }
+        }
+
+        /// <summary>
+        /// Checks if Grants property is set.
+        /// </summary>
+        /// <returns>true if Grants property is set.</returns>
+        internal bool IsSetGrants()
+        {
+            return this.grantList != null && (this.grantList.Count > 0 || !AWSConfigs.InitializeCollections);
+        }
+
         internal void Marshall(string memberName, XmlWriter xmlWriter)
         {
             xmlWriter.WriteStartElement(memberName);
-            if (_grants != null)
+            if (grantList != null)
             {
-                foreach (var grant in _grants)
+                foreach (var grant in grantList)
                 {
                     if (grant != null)
                     {
diff --git a/sdk/src/Services/S3/Custom/Model/S3Object.cs b/sdk/src/Services/S3/Custom/Model/S3Object.cs
index 5f712675a391..a2e7ed3227f2 100644
--- a/sdk/src/Services/S3/Custom/Model/S3Object.cs
+++ b/sdk/src/Services/S3/Custom/Model/S3Object.cs
@@ -25,9 +25,78 @@ namespace Amazon.S3.Model
     /// For more information about S3 Objects refer:
     /// <see href="http://docs.amazonwebservices.com/AmazonS3/latest/UsingObjects.html"/>
     /// </summary>
-    public partial class S3Object
+    public class S3Object
     {
+        private List<string> _checksumAlgorithm = AWSConfigs.InitializeCollections ? new List<string>() : null;
+        private string eTag;
+        private string key;
+        private DateTime? lastModified;
+        private Owner owner;
+        private RestoreStatus _restoreStatus;
+        private long? size;
+        private S3StorageClass storageClass;
         private string bucketName;
+        private ChecksumType checksumType;
+
+        /// <summary>
+        /// Gets and sets the property ChecksumAlgorithm. 
+        /// <para>
+        /// The algorithm that was used to create a checksum of the object.
+        /// </para>
+        /// </summary>
+        public List<string> ChecksumAlgorithm
+        {
+            get { return this._checksumAlgorithm; }
+            set { this._checksumAlgorithm = value; }
+        }
+
+        // Check to see if ChecksumAlgorithm property is set
+        internal bool IsSetChecksumAlgorithm()
+        {
+            return this._checksumAlgorithm != null && (this._checksumAlgorithm.Count > 0 || !AWSConfigs.InitializeCollections);
+        }
+
+        /// <summary>
+        /// Gets and sets the property ETag. 
+        /// <para>
+        /// The entity tag is a hash of the object. The ETag reflects changes only to the contents
+        /// of an object, not its metadata. The ETag may or may not be an MD5 digest of the object
+        /// data. Whether or not it is depends on how the object was created and how it is encrypted
+        /// as described below:
+        /// </para>
+        ///  <ul> <li> 
+        /// <para>
+        /// Objects created by the PUT Object, POST Object, or Copy operation, or through the
+        /// Amazon Web Services Management Console, and are encrypted by SSE-S3 or plaintext,
+        /// have ETags that are an MD5 digest of their object data.
+        /// </para>
+        ///  </li> <li> 
+        /// <para>
+        /// Objects created by the PUT Object, POST Object, or Copy operation, or through the
+        /// Amazon Web Services Management Console, and are encrypted by SSE-C or SSE-KMS, have
+        /// ETags that are not an MD5 digest of their object data.
+        /// </para>
+        ///  </li> <li> 
+        /// <para>
+        /// If an object is created by either the Multipart Upload or Part Copy operation, the
+        /// ETag is not an MD5 digest, regardless of the method of encryption. If an object is
+        /// larger than 16 MB, the Amazon Web Services Management Console will upload or copy
+        /// that object as a Multipart Upload, and therefore the ETag will not be an MD5 digest.
+        /// </para>
+        ///  </li> </ul>
+        /// </summary>
+        public string ETag
+        {
+            get { return this.eTag; }
+            set { this.eTag = value; }
+        }
+
+        // Check to see if ETag property is set
+        internal bool IsSetETag()
+        {
+            return this.eTag != null;
+        }
+
         /// <summary>
         /// The name of the bucket containing this object.
         /// </summary>
@@ -42,5 +111,130 @@ internal bool IsSetBucketName()
         {
             return this.bucketName != null;
         }
+
+        /// <summary>
+        /// The key of the object.
+        /// </summary>
+        public string Key
+        {
+            get { return this.key; }
+            set { this.key = value; }
+        }
+
+        // Check to see if Key property is set
+        internal bool IsSetKey()
+        {
+            return this.key != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property LastModified. 
+        /// <para>
+        /// Date and time when the object was last modified.
+        /// </para>
+        /// <remarks>
+        /// The date retrieved from S3 is in ISO8601 format. A GMT formatted date is passed back to the user.
+        /// </remarks>
+        /// </summary>
+        public DateTime? LastModified
+        {
+            get { return this.lastModified; }
+            set { this.lastModified = value; }
+        }
+
+        // Check to see if LastModified property is set
+        internal bool IsSetLastModified()
+        {
+            return this.lastModified.HasValue;
+        }
+
+        /// <summary>
+        /// The owner of the object.
+        /// </summary>
+        public Owner Owner
+        {
+            get { return this.owner; }
+            set { this.owner = value; }
+        }
+
+        // Check to see if Owner property is set
+        internal bool IsSetOwner()
+        {
+            return this.owner != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property RestoreStatus. 
+        /// <para>
+        /// Specifies the restoration status of an object. Objects in certain storage classes
+        /// must be restored before they can be retrieved. For more information about these storage
+        /// classes and how to work with archived objects, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/archived-objects.html">
+        /// Working with archived objects</a> in the <i>Amazon S3 User Guide</i>.
+        /// </para>
+        /// </summary>
+        public RestoreStatus RestoreStatus
+        {
+            get { return this._restoreStatus; }
+            set { this._restoreStatus = value; }
+        }
+
+        // Check to see if RestoreStatus property is set
+        internal bool IsSetRestoreStatus()
+        {
+            return this._restoreStatus != null;
+        }
+        /// <summary>
+        /// The size of the object.
+        /// </summary>
+        public long? Size
+        {
+            get { return this.size; }
+            set { this.size = value; }
+        }
+
+        // Check to see if Size property is set
+        internal bool IsSetSize()
+        {
+            return this.size.HasValue;
+        }
+
+        /// <summary>
+        /// The class of storage used to store the object.
+        ///  
+        /// </summary>
+        public S3StorageClass StorageClass
+        {
+            get { return this.storageClass; }
+            set { this.storageClass = value; }
+        }
+
+        // Check to see if StorageClass property is set
+        internal bool IsSetStorageClass()
+        {
+            return this.storageClass != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property ChecksumType.
+        /// <para>
+        /// The checksum type that is used to calculate the object's checksum value.
+        /// For more information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html">
+        /// Checking object integrity in the Amazon S3 User Guide</a>.
+        /// </para>
+        /// </summary>
+        public ChecksumType ChecksumType
+        {
+            get { return this.checksumType; }
+            set { this.checksumType = value; }
+        }
+
+        /// <summary>
+        /// Checks to see if ChecksumType is set.
+        /// </summary>
+        /// <returns>true, if ChecksumType property is set.</returns>
+        internal bool IsSetChecksumType()
+        {
+            return checksumType != null;
+        }
     }
 }
diff --git a/sdk/src/Services/S3/Custom/Model/S3ObjectVersion.cs b/sdk/src/Services/S3/Custom/Model/S3ObjectVersion.cs
index 8695fdd0f93b..e4347e8c1b40 100644
--- a/sdk/src/Services/S3/Custom/Model/S3ObjectVersion.cs
+++ b/sdk/src/Services/S3/Custom/Model/S3ObjectVersion.cs
@@ -25,9 +25,31 @@ namespace Amazon.S3.Model
     /// that also has a version identifier, an indication of whether this is the latest version of the object 
     /// and whether it's a DeleteMarker or not.
     /// </summary>
-    public partial class S3ObjectVersion : S3Object
+    public class S3ObjectVersion : S3Object
     {
+
+        private bool? isLatest;
+        private string versionId;
         private bool? isDeleteMarker;
+
+        /// <summary>
+        /// Specifies whether the object is (true) or is not (false) the latest version of an object.
+        /// </summary>
+        public bool? IsLatest
+        {
+            get { return this.isLatest; }
+            set { this.isLatest = value; }
+        }
+
+        /// <summary>
+        /// Version ID of an object.
+        /// </summary>
+        public string VersionId
+        {
+            get { return this.versionId; }
+            set { this.versionId = value; }
+        }
+
         /// <summary>
         /// If true, the object is a delete marker for a deleted object.
         /// </summary>
diff --git a/sdk/src/Services/S3/Generated/Model/CommonPrefix.cs b/sdk/src/Services/S3/Generated/Model/CommonPrefix.cs
deleted file mode 100644
index 8d67aa8bfbde..000000000000
--- a/sdk/src/Services/S3/Generated/Model/CommonPrefix.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Xml.Serialization;
-using System.Text;
-using System.IO;
-using System.Net;
-
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-
-#pragma warning disable CS0612,CS0618,CS1570
-namespace Amazon.S3.Model
-{
-    /// <summary>
-    /// Container for all (if there are any) keys between Prefix and the next occurrence of
-    /// the string specified by a delimiter. CommonPrefixes lists keys that act like subdirectories
-    /// in the directory specified by Prefix. For example, if the prefix is notes/ and the
-    /// delimiter is a slash (/) as in notes/summer/july, the common prefix is notes/summer/.
-    /// </summary>
-    public partial class CommonPrefix
-    {
-        private string _prefix;
-
-        /// <summary>
-        /// Gets and sets the property Prefix. 
-        /// <para>
-        /// Container for the specified common prefix.
-        /// </para>
-        /// </summary>
-        public string Prefix
-        {
-            get { return this._prefix; }
-            set { this._prefix = value; }
-        }
-
-        // Check to see if Prefix property is set
-        internal bool IsSetPrefix()
-        {
-            return this._prefix != null;
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/DeleteMarkerEntry.cs b/sdk/src/Services/S3/Generated/Model/DeleteMarkerEntry.cs
deleted file mode 100644
index 3b28234dbf54..000000000000
--- a/sdk/src/Services/S3/Generated/Model/DeleteMarkerEntry.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Xml.Serialization;
-using System.Text;
-using System.IO;
-using System.Net;
-
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-
-#pragma warning disable CS0612,CS0618,CS1570
-namespace Amazon.S3.Model
-{
-    /// <summary>
-    /// Information about the delete marker.
-    /// </summary>
-    public partial class DeleteMarkerEntry
-    {
-        private bool? _isLatest;
-        private string _key;
-        private DateTime? _lastModified;
-        private Owner _owner;
-        private string _versionId;
-
-        /// <summary>
-        /// Gets and sets the property IsLatest. 
-        /// <para>
-        /// Specifies whether the object is (true) or is not (false) the latest version of an
-        /// object. 
-        /// </para>
-        /// </summary>
-        public bool? IsLatest
-        {
-            get { return this._isLatest; }
-            set { this._isLatest = value; }
-        }
-
-        // Check to see if IsLatest property is set
-        internal bool IsSetIsLatest()
-        {
-            return this._isLatest.HasValue; 
-        }
-
-        /// <summary>
-        /// Gets and sets the property Key. 
-        /// <para>
-        /// The object key.
-        /// </para>
-        /// </summary>
-        [AWSProperty(Min=1)]
-        public string Key
-        {
-            get { return this._key; }
-            set { this._key = value; }
-        }
-
-        // Check to see if Key property is set
-        internal bool IsSetKey()
-        {
-            return this._key != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property LastModified. 
-        /// <para>
-        /// Date and time when the object was last modified.
-        /// </para>
-        /// </summary>
-        public DateTime? LastModified
-        {
-            get { return this._lastModified; }
-            set { this._lastModified = value; }
-        }
-
-        // Check to see if LastModified property is set
-        internal bool IsSetLastModified()
-        {
-            return this._lastModified.HasValue; 
-        }
-
-        /// <summary>
-        /// Gets and sets the property Owner. 
-        /// <para>
-        /// The account that created the delete marker. 
-        /// </para>
-        /// </summary>
-        public Owner Owner
-        {
-            get { return this._owner; }
-            set { this._owner = value; }
-        }
-
-        // Check to see if Owner property is set
-        internal bool IsSetOwner()
-        {
-            return this._owner != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property VersionId. 
-        /// <para>
-        /// Version ID of an object.
-        /// </para>
-        /// </summary>
-        public string VersionId
-        {
-            get { return this._versionId; }
-            set { this._versionId = value; }
-        }
-
-        // Check to see if VersionId property is set
-        internal bool IsSetVersionId()
-        {
-            return this._versionId != null;
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/GetObjectMetadataRequest.cs b/sdk/src/Services/S3/Generated/Model/GetObjectMetadataRequest.cs
deleted file mode 100644
index 0d36daa99e91..000000000000
--- a/sdk/src/Services/S3/Generated/Model/GetObjectMetadataRequest.cs
+++ /dev/null
@@ -1,688 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Xml.Serialization;
-using System.Text;
-using System.IO;
-using System.Net;
-
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-
-#pragma warning disable CS0612,CS0618,CS1570
-namespace Amazon.S3.Model
-{
-    /// <summary>
-    /// Container for the parameters to the GetObjectMetadata operation.
-    /// The <c>HEAD</c> operation retrieves metadata from an object without returning the
-    /// object itself. This operation is useful if you're interested only in an object's metadata.
-    /// 
-    ///  <note> 
-    /// <para>
-    /// A <c>HEAD</c> request has the same options as a <c>GET</c> operation on an object.
-    /// The response is identical to the <c>GET</c> response except that there is no response
-    /// body. Because of this, if the <c>HEAD</c> request generates an error, it returns a
-    /// generic code, such as <c>400 Bad Request</c>, <c>403 Forbidden</c>, <c>404 Not Found</c>,
-    /// <c>405 Method Not Allowed</c>, <c>412 Precondition Failed</c>, or <c>304 Not Modified</c>.
-    /// It's not possible to retrieve the exact exception of these error codes.
-    /// </para>
-    ///  </note> 
-    /// <para>
-    /// Request headers are limited to 8 KB in size. For more information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/RESTCommonRequestHeaders.html">Common
-    /// Request Headers</a>.
-    /// </para>
-    ///  <dl> <dt>Permissions</dt> <dd>  <ul> <li> 
-    /// <para>
-    ///  <b>General purpose bucket permissions</b> - To use <c>HEAD</c>, you must have the
-    /// <c>s3:GetObject</c> permission. You need the relevant read object (or version) permission
-    /// for this operation. For more information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/dev/list_amazons3.html">Actions,
-    /// resources, and condition keys for Amazon S3</a> in the <i>Amazon S3 User Guide</i>.
-    /// For more information about the permissions to S3 API operations by S3 resource types,
-    /// see <a href="/AmazonS3/latest/userguide/using-with-s3-policy-actions.html">Required
-    /// permissions for Amazon S3 API operations</a> in the <i>Amazon S3 User Guide</i>.
-    /// </para>
-    ///  
-    /// <para>
-    /// If the object you request doesn't exist, the error that Amazon S3 returns depends
-    /// on whether you also have the <c>s3:ListBucket</c> permission.
-    /// </para>
-    ///  <ul> <li> 
-    /// <para>
-    /// If you have the <c>s3:ListBucket</c> permission on the bucket, Amazon S3 returns an
-    /// HTTP status code <c>404 Not Found</c> error.
-    /// </para>
-    ///  </li> <li> 
-    /// <para>
-    /// If you don’t have the <c>s3:ListBucket</c> permission, Amazon S3 returns an HTTP status
-    /// code <c>403 Forbidden</c> error.
-    /// </para>
-    ///  </li> </ul> </li> <li> 
-    /// <para>
-    ///  <b>Directory bucket permissions</b> - To grant access to this API operation on a
-    /// directory bucket, we recommend that you use the <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_CreateSession.html">
-    /// <c>CreateSession</c> </a> API operation for session-based authorization. Specifically,
-    /// you grant the <c>s3express:CreateSession</c> permission to the directory bucket in
-    /// a bucket policy or an IAM identity-based policy. Then, you make the <c>CreateSession</c>
-    /// API call on the bucket to obtain a session token. With the session token in your request
-    /// header, you can make API requests to this operation. After the session token expires,
-    /// you make another <c>CreateSession</c> API call to generate a new session token for
-    /// use. Amazon Web Services CLI or SDKs create session and refresh the session token
-    /// automatically to avoid service interruptions when a session expires. For more information
-    /// about authorization, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_CreateSession.html">
-    /// <c>CreateSession</c> </a>.
-    /// </para>
-    ///  
-    /// <para>
-    /// If you enable <c>x-amz-checksum-mode</c> in the request and the object is encrypted
-    /// with Amazon Web Services Key Management Service (Amazon Web Services KMS), you must
-    /// also have the <c>kms:GenerateDataKey</c> and <c>kms:Decrypt</c> permissions in IAM
-    /// identity-based policies and KMS key policies for the KMS key to retrieve the checksum
-    /// of the object.
-    /// </para>
-    ///  </li> </ul> </dd> <dt>Encryption</dt> <dd> <note> 
-    /// <para>
-    /// Encryption request headers, like <c>x-amz-server-side-encryption</c>, should not be
-    /// sent for <c>HEAD</c> requests if your object uses server-side encryption with Key
-    /// Management Service (KMS) keys (SSE-KMS), dual-layer server-side encryption with Amazon
-    /// Web Services KMS keys (DSSE-KMS), or server-side encryption with Amazon S3 managed
-    /// encryption keys (SSE-S3). The <c>x-amz-server-side-encryption</c> header is used when
-    /// you <c>PUT</c> an object to S3 and want to specify the encryption method. If you include
-    /// this header in a <c>HEAD</c> request for an object that uses these types of keys,
-    /// you’ll get an HTTP <c>400 Bad Request</c> error. It's because the encryption method
-    /// can't be changed when you retrieve the object.
-    /// </para>
-    ///  </note> 
-    /// <para>
-    /// If you encrypt an object by using server-side encryption with customer-provided encryption
-    /// keys (SSE-C) when you store the object in Amazon S3, then when you retrieve the metadata
-    /// from the object, you must use the following headers to provide the encryption key
-    /// for the server to be able to retrieve the object's metadata. The headers are: 
-    /// </para>
-    ///  <ul> <li> 
-    /// <para>
-    ///  <c>x-amz-server-side-encryption-customer-algorithm</c> 
-    /// </para>
-    ///  </li> <li> 
-    /// <para>
-    ///  <c>x-amz-server-side-encryption-customer-key</c> 
-    /// </para>
-    ///  </li> <li> 
-    /// <para>
-    ///  <c>x-amz-server-side-encryption-customer-key-MD5</c> 
-    /// </para>
-    ///  </li> </ul> 
-    /// <para>
-    /// For more information about SSE-C, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/dev/ServerSideEncryptionCustomerKeys.html">Server-Side
-    /// Encryption (Using Customer-Provided Encryption Keys)</a> in the <i>Amazon S3 User
-    /// Guide</i>.
-    /// </para>
-    ///  <note> 
-    /// <para>
-    ///  <b>Directory bucket </b> - For directory buckets, there are only two supported options
-    /// for server-side encryption: SSE-S3 and SSE-KMS. SSE-C isn't supported. For more information,
-    /// see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/s3-express-serv-side-encryption.html">Protecting
-    /// data with server-side encryption</a> in the <i>Amazon S3 User Guide</i>. 
-    /// </para>
-    ///  </note> </dd> <dt>Versioning</dt> <dd> <ul> <li> 
-    /// <para>
-    /// If the current version of the object is a delete marker, Amazon S3 behaves as if the
-    /// object was deleted and includes <c>x-amz-delete-marker: true</c> in the response.
-    /// </para>
-    ///  </li> <li> 
-    /// <para>
-    /// If the specified version is a delete marker, the response returns a <c>405 Method
-    /// Not Allowed</c> error and the <c>Last-Modified: timestamp</c> response header.
-    /// </para>
-    ///  </li> </ul> <note> <ul> <li> 
-    /// <para>
-    ///  <b>Directory buckets</b> - Delete marker is not supported for directory buckets.
-    /// </para>
-    ///  </li> <li> 
-    /// <para>
-    ///  <b>Directory buckets</b> - S3 Versioning isn't enabled and supported for directory
-    /// buckets. For this API operation, only the <c>null</c> value of the version ID is supported
-    /// by directory buckets. You can only specify <c>null</c> to the <c>versionId</c> query
-    /// parameter in the request.
-    /// </para>
-    ///  </li> </ul> </note> </dd> <dt>HTTP Host header syntax</dt> <dd> 
-    /// <para>
-    ///  <b>Directory buckets </b> - The HTTP Host header syntax is <c> <i>Bucket-name</i>.s3express-<i>zone-id</i>.<i>region-code</i>.amazonaws.com</c>.
-    /// </para>
-    ///  <note> 
-    /// <para>
-    /// For directory buckets, you must make requests for this API operation to the Zonal
-    /// endpoint. These endpoints support virtual-hosted-style requests in the format <c>https://<i>amzn-s3-demo-bucket</i>.s3express-<i>zone-id</i>.<i>region-code</i>.amazonaws.com/<i>key-name</i>
-    /// </c>. Path-style requests are not supported. For more information about endpoints
-    /// in Availability Zones, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/endpoint-directory-buckets-AZ.html">Regional
-    /// and Zonal endpoints for directory buckets in Availability Zones</a> in the <i>Amazon
-    /// S3 User Guide</i>. For more information about endpoints in Local Zones, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/s3-lzs-for-directory-buckets.html">Concepts
-    /// for directory buckets in Local Zones</a> in the <i>Amazon S3 User Guide</i>.
-    /// </para>
-    ///  </note> </dd> </dl> 
-    /// <para>
-    /// The following actions are related to <c>HeadObject</c>:
-    /// </para>
-    ///  <ul> <li> 
-    /// <para>
-    ///  <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html">GetObject</a>
-    /// 
-    /// </para>
-    ///  </li> <li> 
-    /// <para>
-    ///  <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectAttributes.html">GetObjectAttributes</a>
-    /// 
-    /// </para>
-    ///  </li> </ul>
-    /// </summary>
-    public partial class GetObjectMetadataRequest : AmazonWebServiceRequest
-    {
-        private string _bucketName;
-        private ChecksumMode _checksumMode;
-        private string _etagToMatch;
-        private string _etagToNotMatch;
-        private string _expectedBucketOwner;
-        private string _key;
-        private int? _partNumber;
-        private string _range;
-        private RequestPayer _requestPayer;
-        private string _responseCacheControl;
-        private string _responseContentDisposition;
-        private string _responseContentEncoding;
-        private string _responseContentLanguage;
-        private string _responseContentType;
-        private DateTime? _responseExpires;
-        private ServerSideEncryptionCustomerMethod _serverSideEncryptionCustomerMethod;
-        private string _serverSideEncryptionCustomerProvidedKey;
-        private string _serverSideEncryptionCustomerProvidedKeyMD5;
-        private string _versionId;
-
-        /// <summary>
-        /// Gets and sets the property BucketName. 
-        /// <para>
-        /// The name of the bucket that contains the object.
-        /// </para>
-        ///  
-        /// <para>
-        ///  <b>Directory buckets</b> - When you use this operation with a directory bucket, you
-        /// must use virtual-hosted-style requests in the format <c> <i>Bucket-name</i>.s3express-<i>zone-id</i>.<i>region-code</i>.amazonaws.com</c>.
-        /// Path-style requests are not supported. Directory bucket names must be unique in the
-        /// chosen Zone (Availability Zone or Local Zone). Bucket names must follow the format
-        /// <c> <i>bucket-base-name</i>--<i>zone-id</i>--x-s3</c> (for example, <c> <i>amzn-s3-demo-bucket</i>--<i>usw2-az1</i>--x-s3</c>).
-        /// For information about bucket naming restrictions, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/directory-bucket-naming-rules.html">Directory
-        /// bucket naming rules</a> in the <i>Amazon S3 User Guide</i>.
-        /// </para>
-        ///  
-        /// <para>
-        ///  <b>Access points</b> - When you use this action with an access point for general
-        /// purpose buckets, you must provide the alias of the access point in place of the bucket
-        /// name or specify the access point ARN. When you use this action with an access point
-        /// for directory buckets, you must provide the access point name in place of the bucket
-        /// name. When using the access point ARN, you must direct requests to the access point
-        /// hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com.
-        /// When using this action with an access point through the Amazon Web Services SDKs,
-        /// you provide the access point ARN in place of the bucket name. For more information
-        /// about access point ARNs, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html">Using
-        /// access points</a> in the <i>Amazon S3 User Guide</i>.
-        /// </para>
-        ///  <note> 
-        /// <para>
-        /// Object Lambda access points are not supported by directory buckets.
-        /// </para>
-        ///  </note> 
-        /// <para>
-        ///  <b>S3 on Outposts</b> - When you use this action with S3 on Outposts, you must direct
-        /// requests to the S3 on Outposts hostname. The S3 on Outposts hostname takes the form
-        /// <c> <i>AccessPointName</i>-<i>AccountId</i>.<i>outpostID</i>.s3-outposts.<i>Region</i>.amazonaws.com</c>.
-        /// When you use this action with S3 on Outposts, the destination bucket must be the Outposts
-        /// access point ARN or the access point alias. For more information about S3 on Outposts,
-        /// see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html">What
-        /// is S3 on Outposts?</a> in the <i>Amazon S3 User Guide</i>.
-        /// </para>
-        /// </summary>
-        public string BucketName
-        {
-            get { return this._bucketName; }
-            set { this._bucketName = value; }
-        }
-
-        // Check to see if BucketName property is set
-        internal bool IsSetBucketName()
-        {
-            return this._bucketName != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ChecksumMode. 
-        /// <para>
-        /// To retrieve the checksum, this parameter must be enabled.
-        /// </para>
-        ///  
-        /// <para>
-        ///  <b>General purpose buckets</b> - If you enable checksum mode and the object is uploaded
-        /// with a <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_Checksum.html">checksum</a>
-        /// and encrypted with an Key Management Service (KMS) key, you must have permission to
-        /// use the <c>kms:Decrypt</c> action to retrieve the checksum.
-        /// </para>
-        ///  
-        /// <para>
-        ///  <b>Directory buckets</b> - If you enable <c>ChecksumMode</c> and the object is encrypted
-        /// with Amazon Web Services Key Management Service (Amazon Web Services KMS), you must
-        /// also have the <c>kms:GenerateDataKey</c> and <c>kms:Decrypt</c> permissions in IAM
-        /// identity-based policies and KMS key policies for the KMS key to retrieve the checksum
-        /// of the object.
-        /// </para>
-        /// </summary>
-        public ChecksumMode ChecksumMode
-        {
-            get { return this._checksumMode; }
-            set { this._checksumMode = value; }
-        }
-
-        // Check to see if ChecksumMode property is set
-        internal bool IsSetChecksumMode()
-        {
-            return this._checksumMode != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property EtagToMatch. 
-        /// <para>
-        /// Return the object only if its entity tag (ETag) is the same as the one specified;
-        /// otherwise, return a 412 (precondition failed) error.
-        /// </para>
-        ///  
-        /// <para>
-        /// If both of the <c>If-Match</c> and <c>If-Unmodified-Since</c> headers are present
-        /// in the request as follows:
-        /// </para>
-        ///  <ul> <li> 
-        /// <para>
-        ///  <c>If-Match</c> condition evaluates to <c>true</c>, and;
-        /// </para>
-        ///  </li> <li> 
-        /// <para>
-        ///  <c>If-Unmodified-Since</c> condition evaluates to <c>false</c>;
-        /// </para>
-        ///  </li> </ul> 
-        /// <para>
-        /// Then Amazon S3 returns <c>200 OK</c> and the data requested.
-        /// </para>
-        ///  
-        /// <para>
-        /// For more information about conditional requests, see <a href="https://tools.ietf.org/html/rfc7232">RFC
-        /// 7232</a>.
-        /// </para>
-        /// </summary>
-        public string EtagToMatch
-        {
-            get { return this._etagToMatch; }
-            set { this._etagToMatch = value; }
-        }
-
-        // Check to see if EtagToMatch property is set
-        internal bool IsSetEtagToMatch()
-        {
-            return this._etagToMatch != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property EtagToNotMatch. 
-        /// <para>
-        /// Return the object only if its entity tag (ETag) is different from the one specified;
-        /// otherwise, return a 304 (not modified) error.
-        /// </para>
-        ///  
-        /// <para>
-        /// If both of the <c>If-None-Match</c> and <c>If-Modified-Since</c> headers are present
-        /// in the request as follows:
-        /// </para>
-        ///  <ul> <li> 
-        /// <para>
-        ///  <c>If-None-Match</c> condition evaluates to <c>false</c>, and;
-        /// </para>
-        ///  </li> <li> 
-        /// <para>
-        ///  <c>If-Modified-Since</c> condition evaluates to <c>true</c>;
-        /// </para>
-        ///  </li> </ul> 
-        /// <para>
-        /// Then Amazon S3 returns the <c>304 Not Modified</c> response code.
-        /// </para>
-        ///  
-        /// <para>
-        /// For more information about conditional requests, see <a href="https://tools.ietf.org/html/rfc7232">RFC
-        /// 7232</a>.
-        /// </para>
-        /// </summary>
-        public string EtagToNotMatch
-        {
-            get { return this._etagToNotMatch; }
-            set { this._etagToNotMatch = value; }
-        }
-
-        // Check to see if EtagToNotMatch property is set
-        internal bool IsSetEtagToNotMatch()
-        {
-            return this._etagToNotMatch != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ExpectedBucketOwner. 
-        /// <para>
-        /// The account ID of the expected bucket owner. If the account ID that you provide does
-        /// not match the actual owner of the bucket, the request fails with the HTTP status code
-        /// <c>403 Forbidden</c> (access denied).
-        /// </para>
-        /// </summary>
-        public string ExpectedBucketOwner
-        {
-            get { return this._expectedBucketOwner; }
-            set { this._expectedBucketOwner = value; }
-        }
-
-        // Check to see if ExpectedBucketOwner property is set
-        internal bool IsSetExpectedBucketOwner()
-        {
-            return this._expectedBucketOwner != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property Key. 
-        /// <para>
-        /// The object key.
-        /// </para>
-        /// </summary>
-        [AWSProperty(Required=true, Min=1)]
-        public string Key
-        {
-            get { return this._key; }
-            set { this._key = value; }
-        }
-
-        // Check to see if Key property is set
-        internal bool IsSetKey()
-        {
-            return this._key != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property PartNumber. 
-        /// <para>
-        /// Part number of the object being read. This is a positive integer between 1 and 10,000.
-        /// Effectively performs a 'ranged' HEAD request for the part specified. Useful querying
-        /// about the size of the part and the number of parts in this object.
-        /// </para>
-        /// </summary>
-        public int? PartNumber
-        {
-            get { return this._partNumber; }
-            set { this._partNumber = value; }
-        }
-
-        // Check to see if PartNumber property is set
-        internal bool IsSetPartNumber()
-        {
-            return this._partNumber.HasValue; 
-        }
-
-        /// <summary>
-        /// Gets and sets the property Range. 
-        /// <para>
-        /// HeadObject returns only the metadata for an object. If the Range is satisfiable, only
-        /// the <c>ContentLength</c> is affected in the response. If the Range is not satisfiable,
-        /// S3 returns a <c>416 - Requested Range Not Satisfiable</c> error.
-        /// </para>
-        /// </summary>
-        public string Range
-        {
-            get { return this._range; }
-            set { this._range = value; }
-        }
-
-        // Check to see if Range property is set
-        internal bool IsSetRange()
-        {
-            return this._range != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property RequestPayer.
-        /// </summary>
-        public RequestPayer RequestPayer
-        {
-            get { return this._requestPayer; }
-            set { this._requestPayer = value; }
-        }
-
-        // Check to see if RequestPayer property is set
-        internal bool IsSetRequestPayer()
-        {
-            return this._requestPayer != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ResponseCacheControl. 
-        /// <para>
-        /// Sets the <c>Cache-Control</c> header of the response.
-        /// </para>
-        /// </summary>
-        public string ResponseCacheControl
-        {
-            get { return this._responseCacheControl; }
-            set { this._responseCacheControl = value; }
-        }
-
-        // Check to see if ResponseCacheControl property is set
-        internal bool IsSetResponseCacheControl()
-        {
-            return this._responseCacheControl != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ResponseContentDisposition. 
-        /// <para>
-        /// Sets the <c>Content-Disposition</c> header of the response.
-        /// </para>
-        /// </summary>
-        public string ResponseContentDisposition
-        {
-            get { return this._responseContentDisposition; }
-            set { this._responseContentDisposition = value; }
-        }
-
-        // Check to see if ResponseContentDisposition property is set
-        internal bool IsSetResponseContentDisposition()
-        {
-            return this._responseContentDisposition != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ResponseContentEncoding. 
-        /// <para>
-        /// Sets the <c>Content-Encoding</c> header of the response.
-        /// </para>
-        /// </summary>
-        public string ResponseContentEncoding
-        {
-            get { return this._responseContentEncoding; }
-            set { this._responseContentEncoding = value; }
-        }
-
-        // Check to see if ResponseContentEncoding property is set
-        internal bool IsSetResponseContentEncoding()
-        {
-            return this._responseContentEncoding != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ResponseContentLanguage. 
-        /// <para>
-        /// Sets the <c>Content-Language</c> header of the response.
-        /// </para>
-        /// </summary>
-        public string ResponseContentLanguage
-        {
-            get { return this._responseContentLanguage; }
-            set { this._responseContentLanguage = value; }
-        }
-
-        // Check to see if ResponseContentLanguage property is set
-        internal bool IsSetResponseContentLanguage()
-        {
-            return this._responseContentLanguage != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ResponseContentType. 
-        /// <para>
-        /// Sets the <c>Content-Type</c> header of the response.
-        /// </para>
-        /// </summary>
-        public string ResponseContentType
-        {
-            get { return this._responseContentType; }
-            set { this._responseContentType = value; }
-        }
-
-        // Check to see if ResponseContentType property is set
-        internal bool IsSetResponseContentType()
-        {
-            return this._responseContentType != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ResponseExpires. 
-        /// <para>
-        /// Sets the <c>Expires</c> header of the response.
-        /// </para>
-        /// </summary>
-        public DateTime? ResponseExpires
-        {
-            get { return this._responseExpires; }
-            set { this._responseExpires = value; }
-        }
-
-        // Check to see if ResponseExpires property is set
-        internal bool IsSetResponseExpires()
-        {
-            return this._responseExpires.HasValue; 
-        }
-
-        /// <summary>
-        /// Gets and sets the property ServerSideEncryptionCustomerMethod. 
-        /// <para>
-        /// Specifies the algorithm to use when encrypting the object (for example, AES256).
-        /// </para>
-        ///  <note> 
-        /// <para>
-        /// This functionality is not supported for directory buckets.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public ServerSideEncryptionCustomerMethod ServerSideEncryptionCustomerMethod
-        {
-            get { return this._serverSideEncryptionCustomerMethod; }
-            set { this._serverSideEncryptionCustomerMethod = value; }
-        }
-
-        // Check to see if ServerSideEncryptionCustomerMethod property is set
-        internal bool IsSetServerSideEncryptionCustomerMethod()
-        {
-            return this._serverSideEncryptionCustomerMethod != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ServerSideEncryptionCustomerProvidedKey. 
-        /// <para>
-        /// Specifies the customer-provided encryption key for Amazon S3 to use in encrypting
-        /// data. This value is used to store the object and then it is discarded; Amazon S3 does
-        /// not store the encryption key. The key must be appropriate for use with the algorithm
-        /// specified in the <c>x-amz-server-side-encryption-customer-algorithm</c> header.
-        /// </para>
-        ///  <note> 
-        /// <para>
-        /// This functionality is not supported for directory buckets.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        [AWSProperty(Sensitive=true)]
-        public string ServerSideEncryptionCustomerProvidedKey
-        {
-            get { return this._serverSideEncryptionCustomerProvidedKey; }
-            set { this._serverSideEncryptionCustomerProvidedKey = value; }
-        }
-
-        // Check to see if ServerSideEncryptionCustomerProvidedKey property is set
-        internal bool IsSetServerSideEncryptionCustomerProvidedKey()
-        {
-            return this._serverSideEncryptionCustomerProvidedKey != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ServerSideEncryptionCustomerProvidedKeyMD5. 
-        /// <para>
-        /// Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon
-        /// S3 uses this header for a message integrity check to ensure that the encryption key
-        /// was transmitted without error.
-        /// </para>
-        ///  <note> 
-        /// <para>
-        /// This functionality is not supported for directory buckets.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public string ServerSideEncryptionCustomerProvidedKeyMD5
-        {
-            get { return this._serverSideEncryptionCustomerProvidedKeyMD5; }
-            set { this._serverSideEncryptionCustomerProvidedKeyMD5 = value; }
-        }
-
-        // Check to see if ServerSideEncryptionCustomerProvidedKeyMD5 property is set
-        internal bool IsSetServerSideEncryptionCustomerProvidedKeyMD5()
-        {
-            return this._serverSideEncryptionCustomerProvidedKeyMD5 != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property VersionId. 
-        /// <para>
-        /// Version ID used to reference a specific version of the object.
-        /// </para>
-        ///  <note> 
-        /// <para>
-        /// For directory buckets in this API operation, only the <c>null</c> value of the version
-        /// ID is supported.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public string VersionId
-        {
-            get { return this._versionId; }
-            set { this._versionId = value; }
-        }
-
-        // Check to see if VersionId property is set
-        internal bool IsSetVersionId()
-        {
-            return this._versionId != null;
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/GetObjectMetadataResponse.cs b/sdk/src/Services/S3/Generated/Model/GetObjectMetadataResponse.cs
deleted file mode 100644
index 15a789e27871..000000000000
--- a/sdk/src/Services/S3/Generated/Model/GetObjectMetadataResponse.cs
+++ /dev/null
@@ -1,796 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Xml.Serialization;
-using System.Text;
-using System.IO;
-using System.Net;
-
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-
-#pragma warning disable CS0612,CS0618,CS1570
-namespace Amazon.S3.Model
-{
-    /// <summary>
-    /// This is the response object from the GetObjectMetadata operation.
-    /// </summary>
-    public partial class GetObjectMetadataResponse : AmazonWebServiceResponse
-    {
-        private string _acceptRanges;
-        private ArchiveStatus _archiveStatus;
-        private bool? _bucketKeyEnabled;
-        private string _cacheControl;
-        private string _checksumCRC32;
-        private string _checksumCRC32C;
-        private string _checksumCRC64NVME;
-        private string _checksumSHA1;
-        private string _checksumSHA256;
-        private ChecksumType _checksumType;
-        private string _contentDisposition;
-        private string _contentEncoding;
-        private string _contentLanguage;
-        private string _contentRange;
-        private string _contentType;
-        private string _eTag;
-        private Expiration _expiration;
-        private DateTime? _lastModified;
-        private int? _missingMeta;
-        private ObjectLockLegalHoldStatus _objectLockLegalHoldStatus;
-        private ObjectLockMode _objectLockMode;
-        private DateTime? _objectLockRetainUntilDate;
-        private int? _partsCount;
-        private ReplicationStatus _replicationStatus;
-        private RequestCharged _requestCharged;
-        private string _serverSideEncryptionCustomerProvidedKeyMD5;
-        private string _serverSideEncryptionKeyManagementServiceKeyId;
-        private S3StorageClass _storageClass;
-        private int? _tagsCount;
-        private string _versionId;
-        private string _websiteRedirectLocation;
-
-        /// <summary>
-        /// Gets and sets the property AcceptRanges. 
-        /// <para>
-        /// Indicates that a range of bytes was specified.
-        /// </para>
-        /// </summary>
-        public string AcceptRanges
-        {
-            get { return this._acceptRanges; }
-            set { this._acceptRanges = value; }
-        }
-
-        // Check to see if AcceptRanges property is set
-        internal bool IsSetAcceptRanges()
-        {
-            return this._acceptRanges != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ArchiveStatus. 
-        /// <para>
-        /// The archive state of the head object.
-        /// </para>
-        ///  <note> 
-        /// <para>
-        /// This functionality is not supported for directory buckets.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public ArchiveStatus ArchiveStatus
-        {
-            get { return this._archiveStatus; }
-            set { this._archiveStatus = value; }
-        }
-
-        // Check to see if ArchiveStatus property is set
-        internal bool IsSetArchiveStatus()
-        {
-            return this._archiveStatus != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property BucketKeyEnabled. 
-        /// <para>
-        /// Indicates whether the object uses an S3 Bucket Key for server-side encryption with
-        /// Key Management Service (KMS) keys (SSE-KMS).
-        /// </para>
-        /// </summary>
-        public bool? BucketKeyEnabled
-        {
-            get { return this._bucketKeyEnabled; }
-            set { this._bucketKeyEnabled = value; }
-        }
-
-        // Check to see if BucketKeyEnabled property is set
-        internal bool IsSetBucketKeyEnabled()
-        {
-            return this._bucketKeyEnabled.HasValue; 
-        }
-
-        /// <summary>
-        /// Gets and sets the property CacheControl. 
-        /// <para>
-        /// Specifies caching behavior along the request/reply chain.
-        /// </para>
-        /// </summary>
-        public string CacheControl
-        {
-            get { return this._cacheControl; }
-            set { this._cacheControl = value; }
-        }
-
-        // Check to see if CacheControl property is set
-        internal bool IsSetCacheControl()
-        {
-            return this._cacheControl != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ChecksumCRC32. 
-        /// <para>
-        /// The Base64 encoded, 32-bit <c>CRC32 checksum</c> of the object. This checksum is only
-        /// be present if the checksum was uploaded with the object. When you use an API operation
-        /// on an object that was uploaded using multipart uploads, this value may not be a direct
-        /// checksum value of the full object. Instead, it's a calculation based on the checksum
-        /// values of each individual part. For more information about how checksums are calculated
-        /// with multipart uploads, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html#large-object-checksums">
-        /// Checking object integrity</a> in the <i>Amazon S3 User Guide</i>.
-        /// </para>
-        /// </summary>
-        public string ChecksumCRC32
-        {
-            get { return this._checksumCRC32; }
-            set { this._checksumCRC32 = value; }
-        }
-
-        // Check to see if ChecksumCRC32 property is set
-        internal bool IsSetChecksumCRC32()
-        {
-            return this._checksumCRC32 != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ChecksumCRC32C. 
-        /// <para>
-        /// The Base64 encoded, 32-bit <c>CRC32C</c> checksum of the object. This checksum is
-        /// only present if the checksum was uploaded with the object. When you use an API operation
-        /// on an object that was uploaded using multipart uploads, this value may not be a direct
-        /// checksum value of the full object. Instead, it's a calculation based on the checksum
-        /// values of each individual part. For more information about how checksums are calculated
-        /// with multipart uploads, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html#large-object-checksums">
-        /// Checking object integrity</a> in the <i>Amazon S3 User Guide</i>.
-        /// </para>
-        /// </summary>
-        public string ChecksumCRC32C
-        {
-            get { return this._checksumCRC32C; }
-            set { this._checksumCRC32C = value; }
-        }
-
-        // Check to see if ChecksumCRC32C property is set
-        internal bool IsSetChecksumCRC32C()
-        {
-            return this._checksumCRC32C != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ChecksumCRC64NVME. 
-        /// <para>
-        /// The Base64 encoded, 64-bit <c>CRC64NVME</c> checksum of the object. For more information,
-        /// see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html">Checking
-        /// object integrity in the Amazon S3 User Guide</a>.
-        /// </para>
-        /// </summary>
-        public string ChecksumCRC64NVME
-        {
-            get { return this._checksumCRC64NVME; }
-            set { this._checksumCRC64NVME = value; }
-        }
-
-        // Check to see if ChecksumCRC64NVME property is set
-        internal bool IsSetChecksumCRC64NVME()
-        {
-            return this._checksumCRC64NVME != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ChecksumSHA1. 
-        /// <para>
-        /// The Base64 encoded, 160-bit <c>SHA1</c> digest of the object. This will only be present
-        /// if the object was uploaded with the object. When you use the API operation on an object
-        /// that was uploaded using multipart uploads, this value may not be a direct checksum
-        /// value of the full object. Instead, it's a calculation based on the checksum values
-        /// of each individual part. For more information about how checksums are calculated with
-        /// multipart uploads, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html#large-object-checksums">
-        /// Checking object integrity</a> in the <i>Amazon S3 User Guide</i>.
-        /// </para>
-        /// </summary>
-        public string ChecksumSHA1
-        {
-            get { return this._checksumSHA1; }
-            set { this._checksumSHA1 = value; }
-        }
-
-        // Check to see if ChecksumSHA1 property is set
-        internal bool IsSetChecksumSHA1()
-        {
-            return this._checksumSHA1 != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ChecksumSHA256. 
-        /// <para>
-        /// The Base64 encoded, 256-bit <c>SHA256</c> digest of the object. This will only be
-        /// present if the object was uploaded with the object. When you use an API operation
-        /// on an object that was uploaded using multipart uploads, this value may not be a direct
-        /// checksum value of the full object. Instead, it's a calculation based on the checksum
-        /// values of each individual part. For more information about how checksums are calculated
-        /// with multipart uploads, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html#large-object-checksums">
-        /// Checking object integrity</a> in the <i>Amazon S3 User Guide</i>.
-        /// </para>
-        /// </summary>
-        public string ChecksumSHA256
-        {
-            get { return this._checksumSHA256; }
-            set { this._checksumSHA256 = value; }
-        }
-
-        // Check to see if ChecksumSHA256 property is set
-        internal bool IsSetChecksumSHA256()
-        {
-            return this._checksumSHA256 != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ChecksumType. 
-        /// <para>
-        /// The checksum type, which determines how part-level checksums are combined to create
-        /// an object-level checksum for multipart objects. You can use this header response to
-        /// verify that the checksum type that is received is the same checksum type that was
-        /// specified in <c>CreateMultipartUpload</c> request. For more information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html">Checking
-        /// object integrity in the Amazon S3 User Guide</a>.
-        /// </para>
-        /// </summary>
-        public ChecksumType ChecksumType
-        {
-            get { return this._checksumType; }
-            set { this._checksumType = value; }
-        }
-
-        // Check to see if ChecksumType property is set
-        internal bool IsSetChecksumType()
-        {
-            return this._checksumType != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ContentDisposition. 
-        /// <para>
-        /// Specifies presentational information for the object.
-        /// </para>
-        /// </summary>
-        public string ContentDisposition
-        {
-            get { return this._contentDisposition; }
-            set { this._contentDisposition = value; }
-        }
-
-        // Check to see if ContentDisposition property is set
-        internal bool IsSetContentDisposition()
-        {
-            return this._contentDisposition != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ContentEncoding. 
-        /// <para>
-        /// Indicates what content encodings have been applied to the object and thus what decoding
-        /// mechanisms must be applied to obtain the media-type referenced by the Content-Type
-        /// header field.
-        /// </para>
-        /// </summary>
-        public string ContentEncoding
-        {
-            get { return this._contentEncoding; }
-            set { this._contentEncoding = value; }
-        }
-
-        // Check to see if ContentEncoding property is set
-        internal bool IsSetContentEncoding()
-        {
-            return this._contentEncoding != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ContentLanguage. 
-        /// <para>
-        /// The language the content is in.
-        /// </para>
-        /// </summary>
-        public string ContentLanguage
-        {
-            get { return this._contentLanguage; }
-            set { this._contentLanguage = value; }
-        }
-
-        // Check to see if ContentLanguage property is set
-        internal bool IsSetContentLanguage()
-        {
-            return this._contentLanguage != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ContentRange. 
-        /// <para>
-        /// The portion of the object returned in the response for a <c>GET</c> request.
-        /// </para>
-        /// </summary>
-        public string ContentRange
-        {
-            get { return this._contentRange; }
-            set { this._contentRange = value; }
-        }
-
-        // Check to see if ContentRange property is set
-        internal bool IsSetContentRange()
-        {
-            return this._contentRange != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ContentType. 
-        /// <para>
-        /// A standard MIME type describing the format of the object data.
-        /// </para>
-        /// </summary>
-        public string ContentType
-        {
-            get { return this._contentType; }
-            set { this._contentType = value; }
-        }
-
-        // Check to see if ContentType property is set
-        internal bool IsSetContentType()
-        {
-            return this._contentType != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ETag. 
-        /// <para>
-        /// An entity tag (ETag) is an opaque identifier assigned by a web server to a specific
-        /// version of a resource found at a URL.
-        /// </para>
-        /// </summary>
-        public string ETag
-        {
-            get { return this._eTag; }
-            set { this._eTag = value; }
-        }
-
-        // Check to see if ETag property is set
-        internal bool IsSetETag()
-        {
-            return this._eTag != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property Expiration. 
-        /// <para>
-        /// If the object expiration is configured (see <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketLifecycleConfiguration.html">
-        /// <c>PutBucketLifecycleConfiguration</c> </a>), the response includes this header. It
-        /// includes the <c>expiry-date</c> and <c>rule-id</c> key-value pairs providing object
-        /// expiration information. The value of the <c>rule-id</c> is URL-encoded.
-        /// </para>
-        ///  <note> 
-        /// <para>
-        /// Object expiration information is not returned in directory buckets and this header
-        /// returns the value "<c>NotImplemented</c>" in all responses for directory buckets.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public Expiration Expiration
-        {
-            get { return this._expiration; }
-            set { this._expiration = value; }
-        }
-
-        // Check to see if Expiration property is set
-        internal bool IsSetExpiration()
-        {
-            return this._expiration != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property LastModified. 
-        /// <para>
-        /// Date and time when the object was last modified.
-        /// </para>
-        /// </summary>
-        public DateTime? LastModified
-        {
-            get { return this._lastModified; }
-            set { this._lastModified = value; }
-        }
-
-        // Check to see if LastModified property is set
-        internal bool IsSetLastModified()
-        {
-            return this._lastModified.HasValue; 
-        }
-
-        /// <summary>
-        /// Gets and sets the property MissingMeta. 
-        /// <para>
-        /// This is set to the number of metadata entries not returned in <c>x-amz-meta</c> headers.
-        /// This can happen if you create metadata using an API like SOAP that supports more flexible
-        /// metadata than the REST API. For example, using SOAP, you can create metadata whose
-        /// values are not legal HTTP headers.
-        /// </para>
-        ///  <note> 
-        /// <para>
-        /// This functionality is not supported for directory buckets.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public int? MissingMeta
-        {
-            get { return this._missingMeta; }
-            set { this._missingMeta = value; }
-        }
-
-        // Check to see if MissingMeta property is set
-        internal bool IsSetMissingMeta()
-        {
-            return this._missingMeta.HasValue; 
-        }
-
-        /// <summary>
-        /// Gets and sets the property ObjectLockLegalHoldStatus. 
-        /// <para>
-        /// Specifies whether a legal hold is in effect for this object. This header is only returned
-        /// if the requester has the <c>s3:GetObjectLegalHold</c> permission. This header is not
-        /// returned if the specified version of this object has never had a legal hold applied.
-        /// For more information about S3 Object Lock, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html">Object
-        /// Lock</a>.
-        /// </para>
-        ///  <note> 
-        /// <para>
-        /// This functionality is not supported for directory buckets.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public ObjectLockLegalHoldStatus ObjectLockLegalHoldStatus
-        {
-            get { return this._objectLockLegalHoldStatus; }
-            set { this._objectLockLegalHoldStatus = value; }
-        }
-
-        // Check to see if ObjectLockLegalHoldStatus property is set
-        internal bool IsSetObjectLockLegalHoldStatus()
-        {
-            return this._objectLockLegalHoldStatus != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ObjectLockMode. 
-        /// <para>
-        /// The Object Lock mode, if any, that's in effect for this object. This header is only
-        /// returned if the requester has the <c>s3:GetObjectRetention</c> permission. For more
-        /// information about S3 Object Lock, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html">Object
-        /// Lock</a>. 
-        /// </para>
-        ///  <note> 
-        /// <para>
-        /// This functionality is not supported for directory buckets.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public ObjectLockMode ObjectLockMode
-        {
-            get { return this._objectLockMode; }
-            set { this._objectLockMode = value; }
-        }
-
-        // Check to see if ObjectLockMode property is set
-        internal bool IsSetObjectLockMode()
-        {
-            return this._objectLockMode != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ObjectLockRetainUntilDate. 
-        /// <para>
-        /// The date and time when the Object Lock retention period expires. This header is only
-        /// returned if the requester has the <c>s3:GetObjectRetention</c> permission.
-        /// </para>
-        ///  <note> 
-        /// <para>
-        /// This functionality is not supported for directory buckets.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public DateTime? ObjectLockRetainUntilDate
-        {
-            get { return this._objectLockRetainUntilDate; }
-            set { this._objectLockRetainUntilDate = value; }
-        }
-
-        // Check to see if ObjectLockRetainUntilDate property is set
-        internal bool IsSetObjectLockRetainUntilDate()
-        {
-            return this._objectLockRetainUntilDate.HasValue; 
-        }
-
-        /// <summary>
-        /// Gets and sets the property PartsCount. 
-        /// <para>
-        /// The count of parts this object has. This value is only returned if you specify <c>partNumber</c>
-        /// in your request and the object was uploaded as a multipart upload.
-        /// </para>
-        /// </summary>
-        public int? PartsCount
-        {
-            get { return this._partsCount; }
-            set { this._partsCount = value; }
-        }
-
-        // Check to see if PartsCount property is set
-        internal bool IsSetPartsCount()
-        {
-            return this._partsCount.HasValue; 
-        }
-
-        /// <summary>
-        /// Gets and sets the property ReplicationStatus. 
-        /// <para>
-        /// Amazon S3 can return this header if your request involves a bucket that is either
-        /// a source or a destination in a replication rule.
-        /// </para>
-        ///  
-        /// <para>
-        /// In replication, you have a source bucket on which you configure replication and destination
-        /// bucket or buckets where Amazon S3 stores object replicas. When you request an object
-        /// (<c>GetObject</c>) or object metadata (<c>HeadObject</c>) from these buckets, Amazon
-        /// S3 will return the <c>x-amz-replication-status</c> header in the response as follows:
-        /// </para>
-        ///  <ul> <li> 
-        /// <para>
-        ///  <b>If requesting an object from the source bucket</b>, Amazon S3 will return the
-        /// <c>x-amz-replication-status</c> header if the object in your request is eligible for
-        /// replication.
-        /// </para>
-        ///  
-        /// <para>
-        ///  For example, suppose that in your replication configuration, you specify object prefix
-        /// <c>TaxDocs</c> requesting Amazon S3 to replicate objects with key prefix <c>TaxDocs</c>.
-        /// Any objects you upload with this key name prefix, for example <c>TaxDocs/document1.pdf</c>,
-        /// are eligible for replication. For any object request with this key name prefix, Amazon
-        /// S3 will return the <c>x-amz-replication-status</c> header with value PENDING, COMPLETED
-        /// or FAILED indicating object replication status.
-        /// </para>
-        ///  </li> <li> 
-        /// <para>
-        ///  <b>If requesting an object from a destination bucket</b>, Amazon S3 will return the
-        /// <c>x-amz-replication-status</c> header with value REPLICA if the object in your request
-        /// is a replica that Amazon S3 created and there is no replica modification replication
-        /// in progress.
-        /// </para>
-        ///  </li> <li> 
-        /// <para>
-        ///  <b>When replicating objects to multiple destination buckets</b>, the <c>x-amz-replication-status</c>
-        /// header acts differently. The header of the source object will only return a value
-        /// of COMPLETED when replication is successful to all destinations. The header will remain
-        /// at value PENDING until replication has completed for all destinations. If one or more
-        /// destinations fails replication the header will return FAILED. 
-        /// </para>
-        ///  </li> </ul> 
-        /// <para>
-        /// For more information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html">Replication</a>.
-        /// </para>
-        ///  <note> 
-        /// <para>
-        /// This functionality is not supported for directory buckets.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public ReplicationStatus ReplicationStatus
-        {
-            get { return this._replicationStatus; }
-            set { this._replicationStatus = value; }
-        }
-
-        // Check to see if ReplicationStatus property is set
-        internal bool IsSetReplicationStatus()
-        {
-            return this._replicationStatus != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property RequestCharged.
-        /// </summary>
-        public RequestCharged RequestCharged
-        {
-            get { return this._requestCharged; }
-            set { this._requestCharged = value; }
-        }
-
-        // Check to see if RequestCharged property is set
-        internal bool IsSetRequestCharged()
-        {
-            return this._requestCharged != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ServerSideEncryptionCustomerProvidedKeyMD5. 
-        /// <para>
-        /// If server-side encryption with a customer-provided encryption key was requested, the
-        /// response will include this header to provide the round-trip message integrity verification
-        /// of the customer-provided encryption key.
-        /// </para>
-        ///  <note> 
-        /// <para>
-        /// This functionality is not supported for directory buckets.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public string ServerSideEncryptionCustomerProvidedKeyMD5
-        {
-            get { return this._serverSideEncryptionCustomerProvidedKeyMD5; }
-            set { this._serverSideEncryptionCustomerProvidedKeyMD5 = value; }
-        }
-
-        // Check to see if ServerSideEncryptionCustomerProvidedKeyMD5 property is set
-        internal bool IsSetServerSideEncryptionCustomerProvidedKeyMD5()
-        {
-            return this._serverSideEncryptionCustomerProvidedKeyMD5 != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ServerSideEncryptionKeyManagementServiceKeyId. 
-        /// <para>
-        /// If present, indicates the ID of the KMS key that was used for object encryption.
-        /// </para>
-        /// </summary>
-        [AWSProperty(Sensitive=true)]
-        public string ServerSideEncryptionKeyManagementServiceKeyId
-        {
-            get { return this._serverSideEncryptionKeyManagementServiceKeyId; }
-            set { this._serverSideEncryptionKeyManagementServiceKeyId = value; }
-        }
-
-        // Check to see if ServerSideEncryptionKeyManagementServiceKeyId property is set
-        internal bool IsSetServerSideEncryptionKeyManagementServiceKeyId()
-        {
-            return this._serverSideEncryptionKeyManagementServiceKeyId != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property StorageClass. 
-        /// <para>
-        /// Provides storage class information of the object. Amazon S3 returns this header for
-        /// all objects except for S3 Standard storage class objects.
-        /// </para>
-        ///  
-        /// <para>
-        /// For more information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html">Storage
-        /// Classes</a>.
-        /// </para>
-        ///  <note> 
-        /// <para>
-        ///  <b>Directory buckets </b> - Directory buckets only support <c>EXPRESS_ONEZONE</c>
-        /// (the S3 Express One Zone storage class) in Availability Zones and <c>ONEZONE_IA</c>
-        /// (the S3 One Zone-Infrequent Access storage class) in Dedicated Local Zones.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public S3StorageClass StorageClass
-        {
-            get { return this._storageClass; }
-            set { this._storageClass = value; }
-        }
-
-        // Check to see if StorageClass property is set
-        internal bool IsSetStorageClass()
-        {
-            return this._storageClass != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property TagsCount. 
-        /// <para>
-        /// The number of tags, if any, on the object, when you have the relevant permission to
-        /// read object tags.
-        /// </para>
-        ///  
-        /// <para>
-        /// You can use <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectTagging.html">GetObjectTagging</a>
-        /// to retrieve the tag set associated with an object.
-        /// </para>
-        ///  <note> 
-        /// <para>
-        /// This functionality is not supported for directory buckets.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public int? TagsCount
-        {
-            get { return this._tagsCount; }
-            set { this._tagsCount = value; }
-        }
-
-        // Check to see if TagsCount property is set
-        internal bool IsSetTagsCount()
-        {
-            return this._tagsCount.HasValue; 
-        }
-
-        /// <summary>
-        /// Gets and sets the property VersionId. 
-        /// <para>
-        /// Version ID of the object.
-        /// </para>
-        ///  <note> 
-        /// <para>
-        /// This functionality is not supported for directory buckets.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public string VersionId
-        {
-            get { return this._versionId; }
-            set { this._versionId = value; }
-        }
-
-        // Check to see if VersionId property is set
-        internal bool IsSetVersionId()
-        {
-            return this._versionId != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property WebsiteRedirectLocation. 
-        /// <para>
-        /// If the bucket is configured as a website, redirects requests for this object to another
-        /// object in the same bucket or to an external URL. Amazon S3 stores the value of this
-        /// header in the object metadata.
-        /// </para>
-        ///  <note> 
-        /// <para>
-        /// This functionality is not supported for directory buckets.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public string WebsiteRedirectLocation
-        {
-            get { return this._websiteRedirectLocation; }
-            set { this._websiteRedirectLocation = value; }
-        }
-
-        // Check to see if WebsiteRedirectLocation property is set
-        internal bool IsSetWebsiteRedirectLocation()
-        {
-            return this._websiteRedirectLocation != null;
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/AbortMultipartUploadResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/AbortMultipartUploadResponseUnmarshaller.cs
index c5ab6f91147f..39fe0976d898 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/AbortMultipartUploadResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/AbortMultipartUploadResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for AbortMultipartUpload operation
     /// </summary>  
-    public partial class AbortMultipartUploadResponseUnmarshaller : S3ReponseUnmarshaller
+    public class AbortMultipartUploadResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -49,7 +49,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             if (context.ResponseData.IsHeaderPresent("x-amz-request-charged"))
                 response.RequestCharged = context.ResponseData.GetHeaderValue("x-amz-request-charged");
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -80,8 +79,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, AbortMultipartUploadResponse response);
-
         private static AbortMultipartUploadResponseUnmarshaller _instance = new AbortMultipartUploadResponseUnmarshaller();        
 
         internal static AbortMultipartUploadResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/CommonPrefixUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/CommonPrefixUnmarshaller.cs
deleted file mode 100644
index 65e8e313a3c4..000000000000
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/CommonPrefixUnmarshaller.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Xml.Serialization;
-
-using Amazon.S3.Model;
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-using Amazon.Runtime.Internal.Transform;
-using Amazon.Runtime.Internal.Util;
-
-#pragma warning disable CS0612,CS0618
-namespace Amazon.S3.Model.Internal.MarshallTransformations
-{
-    /// <summary>
-    /// Response Unmarshaller for CommonPrefix Object
-    /// </summary>  
-    public partial class CommonPrefixUnmarshaller : IXmlUnmarshaller<CommonPrefix, XmlUnmarshallerContext>
-    {
-        /// <summary>
-        /// Unmarshaller the response from the service to the response class.
-        /// </summary>  
-        /// <param name="context"></param>
-        /// <returns></returns>
-        public CommonPrefix Unmarshall(XmlUnmarshallerContext context)
-        {
-            CommonPrefix unmarshalledObject = new CommonPrefix();
-            int originalDepth = context.CurrentDepth;
-            int targetDepth = originalDepth + 1;
-            
-            if (context.IsStartOfDocument) 
-               targetDepth += 2;
-            
-            while (context.Read())
-            {
-                if (context.IsStartElement || context.IsAttribute)
-                {
-                    if (context.TestExpression("Prefix", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        unmarshalledObject.Prefix = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-
-                    XmlStructureUnmarshallCustomization(context, unmarshalledObject, targetDepth);
-                }
-                else if (context.IsEndElement && context.CurrentDepth < originalDepth)
-                {
-                    return unmarshalledObject;
-                }
-            }          
-            return unmarshalledObject;
-        }
-
-        partial void XmlStructureUnmarshallCustomization(XmlUnmarshallerContext context, CommonPrefix unmarshalledObject, int targetDepth);
-
-        private static CommonPrefixUnmarshaller _instance = new CommonPrefixUnmarshaller();        
-
-        /// <summary>
-        /// Gets the singleton.
-        /// </summary>  
-        public static CommonPrefixUnmarshaller Instance
-        {
-            get
-            {
-                return _instance;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/CreateBucketMetadataTableConfigurationRequestMarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/CreateBucketMetadataTableConfigurationRequestMarshaller.cs
index 5a60bd469a62..48262db26ae7 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/CreateBucketMetadataTableConfigurationRequestMarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/CreateBucketMetadataTableConfigurationRequestMarshaller.cs
@@ -101,6 +101,8 @@ public IRequest Marshall(CreateBucketMetadataTableConfigurationRequest publicReq
                 string content = stringWriter.ToString();
                 request.Content = System.Text.Encoding.UTF8.GetBytes(content);
                 request.Headers["Content-Type"] = "application/xml";
+                if (publicRequest.IsSetContentMD5())
+                    request.Headers[Amazon.Util.HeaderKeys.ContentMD5Header] = publicRequest.ContentMD5;
                 ChecksumUtils.SetChecksumData(
                     request,
                     publicRequest.ChecksumAlgorithm,
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/CreateBucketMetadataTableConfigurationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/CreateBucketMetadataTableConfigurationResponseUnmarshaller.cs
index f086b4aab2bc..1d2e9e85c451 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/CreateBucketMetadataTableConfigurationResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/CreateBucketMetadataTableConfigurationResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for CreateBucketMetadataTableConfiguration operation
     /// </summary>  
-    public partial class CreateBucketMetadataTableConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
+    public class CreateBucketMetadataTableConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -47,7 +47,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
         {
             CreateBucketMetadataTableConfigurationResponse response = new CreateBucketMetadataTableConfigurationResponse();
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -74,8 +73,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, CreateBucketMetadataTableConfigurationResponse response);
-
         private static CreateBucketMetadataTableConfigurationResponseUnmarshaller _instance = new CreateBucketMetadataTableConfigurationResponseUnmarshaller();        
 
         internal static CreateBucketMetadataTableConfigurationResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketEncryptionResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketEncryptionResponseUnmarshaller.cs
index 1f5ee0e2fef7..f8bbcc240f7f 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketEncryptionResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketEncryptionResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for DeleteBucketEncryption operation
     /// </summary>  
-    public partial class DeleteBucketEncryptionResponseUnmarshaller : S3ReponseUnmarshaller
+    public class DeleteBucketEncryptionResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -47,7 +47,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
         {
             DeleteBucketEncryptionResponse response = new DeleteBucketEncryptionResponse();
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -74,8 +73,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, DeleteBucketEncryptionResponse response);
-
         private static DeleteBucketEncryptionResponseUnmarshaller _instance = new DeleteBucketEncryptionResponseUnmarshaller();        
 
         internal static DeleteBucketEncryptionResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketMetadataTableConfigurationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketMetadataTableConfigurationResponseUnmarshaller.cs
index a6269b28a1da..295814ec497f 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketMetadataTableConfigurationResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketMetadataTableConfigurationResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for DeleteBucketMetadataTableConfiguration operation
     /// </summary>  
-    public partial class DeleteBucketMetadataTableConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
+    public class DeleteBucketMetadataTableConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -47,7 +47,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
         {
             DeleteBucketMetadataTableConfigurationResponse response = new DeleteBucketMetadataTableConfigurationResponse();
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -74,8 +73,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, DeleteBucketMetadataTableConfigurationResponse response);
-
         private static DeleteBucketMetadataTableConfigurationResponseUnmarshaller _instance = new DeleteBucketMetadataTableConfigurationResponseUnmarshaller();        
 
         internal static DeleteBucketMetadataTableConfigurationResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketOwnershipControlsResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketOwnershipControlsResponseUnmarshaller.cs
index 889425e6be97..cde6ce0c1346 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketOwnershipControlsResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketOwnershipControlsResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for DeleteBucketOwnershipControls operation
     /// </summary>  
-    public partial class DeleteBucketOwnershipControlsResponseUnmarshaller : S3ReponseUnmarshaller
+    public class DeleteBucketOwnershipControlsResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -47,7 +47,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
         {
             DeleteBucketOwnershipControlsResponse response = new DeleteBucketOwnershipControlsResponse();
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -74,8 +73,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, DeleteBucketOwnershipControlsResponse response);
-
         private static DeleteBucketOwnershipControlsResponseUnmarshaller _instance = new DeleteBucketOwnershipControlsResponseUnmarshaller();        
 
         internal static DeleteBucketOwnershipControlsResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketPolicyResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketPolicyResponseUnmarshaller.cs
index e2ce12b0ede5..3586e9c94a6a 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketPolicyResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketPolicyResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for DeleteBucketPolicy operation
     /// </summary>  
-    public partial class DeleteBucketPolicyResponseUnmarshaller : S3ReponseUnmarshaller
+    public class DeleteBucketPolicyResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -47,7 +47,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
         {
             DeleteBucketPolicyResponse response = new DeleteBucketPolicyResponse();
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -74,8 +73,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, DeleteBucketPolicyResponse response);
-
         private static DeleteBucketPolicyResponseUnmarshaller _instance = new DeleteBucketPolicyResponseUnmarshaller();        
 
         internal static DeleteBucketPolicyResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketReplicationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketReplicationResponseUnmarshaller.cs
index 63fdb21c4e09..3c0c2b74188a 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketReplicationResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketReplicationResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for DeleteBucketReplication operation
     /// </summary>  
-    public partial class DeleteBucketReplicationResponseUnmarshaller : S3ReponseUnmarshaller
+    public class DeleteBucketReplicationResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -47,7 +47,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
         {
             DeleteBucketReplicationResponse response = new DeleteBucketReplicationResponse();
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -74,8 +73,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, DeleteBucketReplicationResponse response);
-
         private static DeleteBucketReplicationResponseUnmarshaller _instance = new DeleteBucketReplicationResponseUnmarshaller();        
 
         internal static DeleteBucketReplicationResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketResponseUnmarshaller.cs
index 0b3cfa618b61..82347c889e13 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for DeleteBucket operation
     /// </summary>  
-    public partial class DeleteBucketResponseUnmarshaller : S3ReponseUnmarshaller
+    public class DeleteBucketResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -47,7 +47,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
         {
             DeleteBucketResponse response = new DeleteBucketResponse();
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -74,8 +73,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, DeleteBucketResponse response);
-
         private static DeleteBucketResponseUnmarshaller _instance = new DeleteBucketResponseUnmarshaller();        
 
         internal static DeleteBucketResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketTaggingResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketTaggingResponseUnmarshaller.cs
index 9165a8a7ccaf..d53376ed03cb 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketTaggingResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteBucketTaggingResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for DeleteBucketTagging operation
     /// </summary>  
-    public partial class DeleteBucketTaggingResponseUnmarshaller : S3ReponseUnmarshaller
+    public class DeleteBucketTaggingResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -47,7 +47,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
         {
             DeleteBucketTaggingResponse response = new DeleteBucketTaggingResponse();
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -74,8 +73,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, DeleteBucketTaggingResponse response);
-
         private static DeleteBucketTaggingResponseUnmarshaller _instance = new DeleteBucketTaggingResponseUnmarshaller();        
 
         internal static DeleteBucketTaggingResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteCORSConfigurationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteCORSConfigurationResponseUnmarshaller.cs
index 15991f0bdbf5..b9b401722f02 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteCORSConfigurationResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteCORSConfigurationResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for DeleteCORSConfiguration operation
     /// </summary>  
-    public partial class DeleteCORSConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
+    public class DeleteCORSConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -47,7 +47,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
         {
             DeleteCORSConfigurationResponse response = new DeleteCORSConfigurationResponse();
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -74,8 +73,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, DeleteCORSConfigurationResponse response);
-
         private static DeleteCORSConfigurationResponseUnmarshaller _instance = new DeleteCORSConfigurationResponseUnmarshaller();        
 
         internal static DeleteCORSConfigurationResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteLifecycleConfigurationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteLifecycleConfigurationResponseUnmarshaller.cs
index 3c235b9f6de8..c73152459169 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteLifecycleConfigurationResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteLifecycleConfigurationResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for DeleteLifecycleConfiguration operation
     /// </summary>  
-    public partial class DeleteLifecycleConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
+    public class DeleteLifecycleConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -47,7 +47,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
         {
             DeleteLifecycleConfigurationResponse response = new DeleteLifecycleConfigurationResponse();
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -74,8 +73,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, DeleteLifecycleConfigurationResponse response);
-
         private static DeleteLifecycleConfigurationResponseUnmarshaller _instance = new DeleteLifecycleConfigurationResponseUnmarshaller();        
 
         internal static DeleteLifecycleConfigurationResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteMarkerEntryUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteMarkerEntryUnmarshaller.cs
deleted file mode 100644
index f95cb8d86281..000000000000
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeleteMarkerEntryUnmarshaller.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Xml.Serialization;
-
-using Amazon.S3.Model;
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-using Amazon.Runtime.Internal.Transform;
-using Amazon.Runtime.Internal.Util;
-
-#pragma warning disable CS0612,CS0618
-namespace Amazon.S3.Model.Internal.MarshallTransformations
-{
-    /// <summary>
-    /// Response Unmarshaller for DeleteMarkerEntry Object
-    /// </summary>  
-    public partial class DeleteMarkerEntryUnmarshaller : IXmlUnmarshaller<DeleteMarkerEntry, XmlUnmarshallerContext>
-    {
-        /// <summary>
-        /// Unmarshaller the response from the service to the response class.
-        /// </summary>  
-        /// <param name="context"></param>
-        /// <returns></returns>
-        public DeleteMarkerEntry Unmarshall(XmlUnmarshallerContext context)
-        {
-            DeleteMarkerEntry unmarshalledObject = new DeleteMarkerEntry();
-            int originalDepth = context.CurrentDepth;
-            int targetDepth = originalDepth + 1;
-            
-            if (context.IsStartOfDocument) 
-               targetDepth += 2;
-            
-            while (context.Read())
-            {
-                if (context.IsStartElement || context.IsAttribute)
-                {
-                    if (context.TestExpression("IsLatest", targetDepth))
-                    {
-                        var unmarshaller = NullableBoolUnmarshaller.Instance;
-                        unmarshalledObject.IsLatest = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("Key", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        unmarshalledObject.Key = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("LastModified", targetDepth))
-                    {
-                        var unmarshaller = NullableDateTimeUnmarshaller.Instance;
-                        unmarshalledObject.LastModified = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("Owner", targetDepth))
-                    {
-                        var unmarshaller = OwnerUnmarshaller.Instance;
-                        unmarshalledObject.Owner = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("VersionId", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        unmarshalledObject.VersionId = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-
-                    XmlStructureUnmarshallCustomization(context, unmarshalledObject, targetDepth);
-                }
-                else if (context.IsEndElement && context.CurrentDepth < originalDepth)
-                {
-                    return unmarshalledObject;
-                }
-            }          
-            return unmarshalledObject;
-        }
-
-        partial void XmlStructureUnmarshallCustomization(XmlUnmarshallerContext context, DeleteMarkerEntry unmarshalledObject, int targetDepth);
-
-        private static DeleteMarkerEntryUnmarshaller _instance = new DeleteMarkerEntryUnmarshaller();        
-
-        /// <summary>
-        /// Gets the singleton.
-        /// </summary>  
-        public static DeleteMarkerEntryUnmarshaller Instance
-        {
-            get
-            {
-                return _instance;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeletePublicAccessBlockResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeletePublicAccessBlockResponseUnmarshaller.cs
index c0de48728a8b..671c2b4b862e 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeletePublicAccessBlockResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/DeletePublicAccessBlockResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for DeletePublicAccessBlock operation
     /// </summary>  
-    public partial class DeletePublicAccessBlockResponseUnmarshaller : S3ReponseUnmarshaller
+    public class DeletePublicAccessBlockResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -47,7 +47,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
         {
             DeletePublicAccessBlockResponse response = new DeletePublicAccessBlockResponse();
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -74,8 +73,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, DeletePublicAccessBlockResponse response);
-
         private static DeletePublicAccessBlockResponseUnmarshaller _instance = new DeletePublicAccessBlockResponseUnmarshaller();        
 
         internal static DeletePublicAccessBlockResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketAccelerateConfigurationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketAccelerateConfigurationResponseUnmarshaller.cs
index 5500a6578881..a02eaa2fd51b 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketAccelerateConfigurationResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketAccelerateConfigurationResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetBucketAccelerateConfiguration operation
     /// </summary>  
-    public partial class GetBucketAccelerateConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetBucketAccelerateConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -50,7 +50,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             if (context.ResponseData.IsHeaderPresent("x-amz-request-charged"))
                 response.RequestCharged = context.ResponseData.GetHeaderValue("x-amz-request-charged");
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -80,6 +79,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetBucketAc
                     return;
                 }
             }
+          
             return;
         }
   
@@ -106,8 +106,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetBucketAccelerateConfigurationResponse response);
-
         private static GetBucketAccelerateConfigurationResponseUnmarshaller _instance = new GetBucketAccelerateConfigurationResponseUnmarshaller();        
 
         internal static GetBucketAccelerateConfigurationResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketAclResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketAclResponseUnmarshaller.cs
index c58f225b7d9a..a2a126baf47a 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketAclResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketAclResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetBucketAcl operation
     /// </summary>  
-    public partial class GetBucketAclResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetBucketAclResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,7 +48,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             GetBucketAclResponse response = new GetBucketAclResponse();
             UnmarshallResult(context,response);
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -88,6 +87,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetBucketAc
                     return;
                 }
             }
+          
             return;
         }
   
@@ -114,8 +114,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetBucketAclResponse response);
-
         private static GetBucketAclResponseUnmarshaller _instance = new GetBucketAclResponseUnmarshaller();        
 
         internal static GetBucketAclResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketEncryptionResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketEncryptionResponseUnmarshaller.cs
index 70cdc27f92d7..7f92423f5be1 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketEncryptionResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketEncryptionResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetBucketEncryption operation
     /// </summary>  
-    public partial class GetBucketEncryptionResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetBucketEncryptionResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,7 +48,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             GetBucketEncryptionResponse response = new GetBucketEncryptionResponse();
             UnmarshallResult(context,response);
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -76,6 +75,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetBucketEn
                     return;
                 }
             }
+          
             return;
         }
   
@@ -102,8 +102,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetBucketEncryptionResponse response);
-
         private static GetBucketEncryptionResponseUnmarshaller _instance = new GetBucketEncryptionResponseUnmarshaller();        
 
         internal static GetBucketEncryptionResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketLocationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketLocationResponseUnmarshaller.cs
index 786e326aaf40..ed5ed1d760c2 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketLocationResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketLocationResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetBucketLocation operation
     /// </summary>  
-    public partial class GetBucketLocationResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetBucketLocationResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,7 +48,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             GetBucketLocationResponse response = new GetBucketLocationResponse();
             UnmarshallResult(context,response);
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -76,6 +75,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetBucketLo
                     return;
                 }
             }
+          
             return;
         }
   
@@ -102,8 +102,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetBucketLocationResponse response);
-
         private static GetBucketLocationResponseUnmarshaller _instance = new GetBucketLocationResponseUnmarshaller();        
 
         internal static GetBucketLocationResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketMetadataTableConfigurationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketMetadataTableConfigurationResponseUnmarshaller.cs
index 4b8c4a0f2b04..2a03a976b2f0 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketMetadataTableConfigurationResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketMetadataTableConfigurationResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetBucketMetadataTableConfiguration operation
     /// </summary>  
-    public partial class GetBucketMetadataTableConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetBucketMetadataTableConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,7 +48,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             GetBucketMetadataTableConfigurationResponse response = new GetBucketMetadataTableConfigurationResponse();
             UnmarshallResult(context,response);
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -76,6 +75,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetBucketMe
                     return;
                 }
             }
+          
             return;
         }
   
@@ -102,8 +102,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetBucketMetadataTableConfigurationResponse response);
-
         private static GetBucketMetadataTableConfigurationResponseUnmarshaller _instance = new GetBucketMetadataTableConfigurationResponseUnmarshaller();        
 
         internal static GetBucketMetadataTableConfigurationResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketNotificationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketNotificationResponseUnmarshaller.cs
index f2ae62def887..89e0359a8889 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketNotificationResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketNotificationResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetBucketNotification operation
     /// </summary>  
-    public partial class GetBucketNotificationResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetBucketNotificationResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,7 +48,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             GetBucketNotificationResponse response = new GetBucketNotificationResponse();
             UnmarshallResult(context,response);
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -108,6 +107,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetBucketNo
                     return;
                 }
             }
+          
             return;
         }
   
@@ -134,8 +134,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetBucketNotificationResponse response);
-
         private static GetBucketNotificationResponseUnmarshaller _instance = new GetBucketNotificationResponseUnmarshaller();        
 
         internal static GetBucketNotificationResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketOwnershipControlsResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketOwnershipControlsResponseUnmarshaller.cs
index 4ea88dcb6b16..810b89649456 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketOwnershipControlsResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketOwnershipControlsResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetBucketOwnershipControls operation
     /// </summary>  
-    public partial class GetBucketOwnershipControlsResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetBucketOwnershipControlsResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,7 +48,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             GetBucketOwnershipControlsResponse response = new GetBucketOwnershipControlsResponse();
             UnmarshallResult(context,response);
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -76,6 +75,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetBucketOw
                     return;
                 }
             }
+          
             return;
         }
   
@@ -102,8 +102,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetBucketOwnershipControlsResponse response);
-
         private static GetBucketOwnershipControlsResponseUnmarshaller _instance = new GetBucketOwnershipControlsResponseUnmarshaller();        
 
         internal static GetBucketOwnershipControlsResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketPolicyResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketPolicyResponseUnmarshaller.cs
index 5a84d4d2ac5f..365cbdbf48d2 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketPolicyResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketPolicyResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetBucketPolicy operation
     /// </summary>  
-    public partial class GetBucketPolicyResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetBucketPolicyResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -51,7 +51,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             response.Policy = sr.ReadToEnd();
         }
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -78,8 +77,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetBucketPolicyResponse response);
-
         private static GetBucketPolicyResponseUnmarshaller _instance = new GetBucketPolicyResponseUnmarshaller();        
 
         internal static GetBucketPolicyResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketPolicyStatusResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketPolicyStatusResponseUnmarshaller.cs
index 454e1664fb79..4bfd5afb99be 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketPolicyStatusResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketPolicyStatusResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetBucketPolicyStatus operation
     /// </summary>  
-    public partial class GetBucketPolicyStatusResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetBucketPolicyStatusResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,7 +48,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             GetBucketPolicyStatusResponse response = new GetBucketPolicyStatusResponse();
             UnmarshallResult(context,response);
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -76,6 +75,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetBucketPo
                     return;
                 }
             }
+          
             return;
         }
   
@@ -102,8 +102,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetBucketPolicyStatusResponse response);
-
         private static GetBucketPolicyStatusResponseUnmarshaller _instance = new GetBucketPolicyStatusResponseUnmarshaller();        
 
         internal static GetBucketPolicyStatusResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketReplicationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketReplicationResponseUnmarshaller.cs
index d8a70d0e1c60..035b9378a3e7 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketReplicationResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketReplicationResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetBucketReplication operation
     /// </summary>  
-    public partial class GetBucketReplicationResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetBucketReplicationResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,7 +48,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             GetBucketReplicationResponse response = new GetBucketReplicationResponse();
             UnmarshallResult(context,response);
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -76,6 +75,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetBucketRe
                     return;
                 }
             }
+          
             return;
         }
   
@@ -102,8 +102,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetBucketReplicationResponse response);
-
         private static GetBucketReplicationResponseUnmarshaller _instance = new GetBucketReplicationResponseUnmarshaller();        
 
         internal static GetBucketReplicationResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketRequestPaymentResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketRequestPaymentResponseUnmarshaller.cs
index 5f9b74270b31..093489aeada9 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketRequestPaymentResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketRequestPaymentResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetBucketRequestPayment operation
     /// </summary>  
-    public partial class GetBucketRequestPaymentResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetBucketRequestPaymentResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,7 +48,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             GetBucketRequestPaymentResponse response = new GetBucketRequestPaymentResponse();
             UnmarshallResult(context,response);
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -78,6 +77,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetBucketRe
                     return;
                 }
             }
+          
             return;
         }
   
@@ -104,8 +104,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetBucketRequestPaymentResponse response);
-
         private static GetBucketRequestPaymentResponseUnmarshaller _instance = new GetBucketRequestPaymentResponseUnmarshaller();        
 
         internal static GetBucketRequestPaymentResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketTaggingResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketTaggingResponseUnmarshaller.cs
index 637534b6ebd1..0e29de00f097 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketTaggingResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetBucketTaggingResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetBucketTagging operation
     /// </summary>  
-    public partial class GetBucketTaggingResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetBucketTaggingResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,7 +48,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             GetBucketTaggingResponse response = new GetBucketTaggingResponse();
             UnmarshallResult(context,response);
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -82,6 +81,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetBucketTa
                     return;
                 }
             }
+          
             return;
         }
   
@@ -108,8 +108,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetBucketTaggingResponse response);
-
         private static GetBucketTaggingResponseUnmarshaller _instance = new GetBucketTaggingResponseUnmarshaller();        
 
         internal static GetBucketTaggingResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetCORSConfigurationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetCORSConfigurationResponseUnmarshaller.cs
index d4955b0430b6..4a16529c6985 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetCORSConfigurationResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetCORSConfigurationResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetCORSConfiguration operation
     /// </summary>  
-    public partial class GetCORSConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetCORSConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,7 +48,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             GetCORSConfigurationResponse response = new GetCORSConfigurationResponse();
             UnmarshallResult(context,response);
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -75,6 +74,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetCORSConf
                     return;
                 }
             }
+          
             return;
         }
   
@@ -101,8 +101,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetCORSConfigurationResponse response);
-
         private static GetCORSConfigurationResponseUnmarshaller _instance = new GetCORSConfigurationResponseUnmarshaller();        
 
         internal static GetCORSConfigurationResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetLifecycleConfigurationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetLifecycleConfigurationResponseUnmarshaller.cs
index fca9e984515e..7883ea956b76 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetLifecycleConfigurationResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetLifecycleConfigurationResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetLifecycleConfiguration operation
     /// </summary>  
-    public partial class GetLifecycleConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetLifecycleConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -50,7 +50,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             if (context.ResponseData.IsHeaderPresent("x-amz-transition-default-minimum-object-size"))
                 response.TransitionDefaultMinimumObjectSize = context.ResponseData.GetHeaderValue("x-amz-transition-default-minimum-object-size");
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -77,6 +76,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetLifecycl
                     return;
                 }
             }
+          
             return;
         }
   
@@ -103,8 +103,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetLifecycleConfigurationResponse response);
-
         private static GetLifecycleConfigurationResponseUnmarshaller _instance = new GetLifecycleConfigurationResponseUnmarshaller();        
 
         internal static GetLifecycleConfigurationResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectAttributesResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectAttributesResponseUnmarshaller.cs
index 345f67a9f67c..ccced5c7a2a7 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectAttributesResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectAttributesResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetObjectAttributes operation
     /// </summary>  
-    public partial class GetObjectAttributesResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetObjectAttributesResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -56,7 +56,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             if (context.ResponseData.IsHeaderPresent("x-amz-version-id"))
                 response.VersionId = context.ResponseData.GetHeaderValue("x-amz-version-id");
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -110,6 +109,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetObjectAt
                     return;
                 }
             }
+          
             return;
         }
   
@@ -140,8 +140,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetObjectAttributesResponse response);
-
         private static GetObjectAttributesResponseUnmarshaller _instance = new GetObjectAttributesResponseUnmarshaller();        
 
         internal static GetObjectAttributesResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectLegalHoldResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectLegalHoldResponseUnmarshaller.cs
index e5f5dc6c5381..13b0e79b2164 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectLegalHoldResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectLegalHoldResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetObjectLegalHold operation
     /// </summary>  
-    public partial class GetObjectLegalHoldResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetObjectLegalHoldResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,7 +48,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             GetObjectLegalHoldResponse response = new GetObjectLegalHoldResponse();
             UnmarshallResult(context,response);
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -76,6 +75,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetObjectLe
                     return;
                 }
             }
+          
             return;
         }
   
@@ -102,8 +102,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetObjectLegalHoldResponse response);
-
         private static GetObjectLegalHoldResponseUnmarshaller _instance = new GetObjectLegalHoldResponseUnmarshaller();        
 
         internal static GetObjectLegalHoldResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectLockConfigurationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectLockConfigurationResponseUnmarshaller.cs
index 96d9f37859f0..e4e3bb39a265 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectLockConfigurationResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectLockConfigurationResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetObjectLockConfiguration operation
     /// </summary>  
-    public partial class GetObjectLockConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetObjectLockConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,7 +48,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             GetObjectLockConfigurationResponse response = new GetObjectLockConfigurationResponse();
             UnmarshallResult(context,response);
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -76,6 +75,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetObjectLo
                     return;
                 }
             }
+          
             return;
         }
   
@@ -102,8 +102,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetObjectLockConfigurationResponse response);
-
         private static GetObjectLockConfigurationResponseUnmarshaller _instance = new GetObjectLockConfigurationResponseUnmarshaller();        
 
         internal static GetObjectLockConfigurationResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectMetadataRequestMarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectMetadataRequestMarshaller.cs
deleted file mode 100644
index 27c4a3174247..000000000000
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectMetadataRequestMarshaller.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Text;
-using System.Xml.Serialization;
-
-using Amazon.S3.Model;
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-using Amazon.Runtime.Internal.Transform;
-using Amazon.Runtime.Internal.Util;
-using System.Xml;
-
-#pragma warning disable CS0612,CS0618
-namespace Amazon.S3.Model.Internal.MarshallTransformations
-{
-    /// <summary>
-    /// GetObjectMetadata Request Marshaller
-    /// </summary>       
-    public partial class GetObjectMetadataRequestMarshaller : IMarshaller<IRequest, GetObjectMetadataRequest> , IMarshaller<IRequest,AmazonWebServiceRequest>
-    {
-        /// <summary>
-        /// Marshaller the request object to the HTTP request.
-        /// </summary>  
-        /// <param name="input"></param>
-        /// <returns></returns>
-        public IRequest Marshall(AmazonWebServiceRequest input)
-        {
-            return this.Marshall((GetObjectMetadataRequest)input);
-        }
-
-        /// <summary>
-        /// Marshaller the request object to the HTTP request.
-        /// </summary>  
-        /// <param name="publicRequest"></param>
-        /// <returns></returns>
-        public IRequest Marshall(GetObjectMetadataRequest publicRequest)
-        {
-            var request = new DefaultRequest(publicRequest, "Amazon.S3");
-            request.HttpMethod = "HEAD";
-        
-            if (publicRequest.IsSetChecksumMode()) 
-            {
-                request.Headers["x-amz-checksum-mode"] = publicRequest.ChecksumMode;
-            }
-        
-            if (publicRequest.IsSetEtagToMatch()) 
-            {
-                request.Headers["If-Match"] = publicRequest.EtagToMatch;
-            }
-        
-            if (publicRequest.IsSetEtagToNotMatch()) 
-            {
-                request.Headers["If-None-Match"] = publicRequest.EtagToNotMatch;
-            }
-        
-            if (publicRequest.IsSetExpectedBucketOwner()) 
-            {
-                request.Headers["x-amz-expected-bucket-owner"] = publicRequest.ExpectedBucketOwner;
-            }
-        
-            if (publicRequest.IsSetModifiedSinceDate()) 
-            {
-                request.Headers["If-Modified-Since"] = StringUtils.FromDateTimeToRFC822(publicRequest.ModifiedSinceDate);
-            }
-        
-            if (publicRequest.IsSetRange()) 
-            {
-                request.Headers["Range"] = publicRequest.Range;
-            }
-        
-            if (publicRequest.IsSetRequestPayer()) 
-            {
-                request.Headers["x-amz-request-payer"] = publicRequest.RequestPayer;
-            }
-        
-            if (publicRequest.IsSetServerSideEncryptionCustomerMethod()) 
-            {
-                request.Headers["x-amz-server-side-encryption-customer-algorithm"] = StringUtils.FromString(publicRequest.ServerSideEncryptionCustomerMethod);
-            }
-        
-            if (publicRequest.IsSetUnmodifiedSinceDate()) 
-            {
-                request.Headers["If-Unmodified-Since"] = StringUtils.FromDateTimeToRFC822(publicRequest.UnmodifiedSinceDate);
-            }
-            if (string.IsNullOrEmpty(publicRequest.BucketName))
-                throw new System.ArgumentException("BucketName is a required property and must be set before making this call.", "GetObjectMetadataRequest.BucketName");
-            if (string.IsNullOrEmpty(publicRequest.Key))
-                throw new System.ArgumentException("Key is a required property and must be set before making this call.", "GetObjectMetadataRequest.Key");
-            request.AddPathResource("{Key+}", StringUtils.FromString(publicRequest.Key));
-            
-            if (publicRequest.IsSetPartNumber())
-                request.AddSubResource("partNumber", StringUtils.FromInt(publicRequest.PartNumber));
-            
-            if (publicRequest.IsSetResponseCacheControl())
-                request.AddSubResource("response-cache-control", StringUtils.FromString(publicRequest.ResponseCacheControl));
-            
-            if (publicRequest.IsSetResponseContentDisposition())
-                request.AddSubResource("response-content-disposition", StringUtils.FromString(publicRequest.ResponseContentDisposition));
-            
-            if (publicRequest.IsSetResponseContentEncoding())
-                request.AddSubResource("response-content-encoding", StringUtils.FromString(publicRequest.ResponseContentEncoding));
-            
-            if (publicRequest.IsSetResponseContentLanguage())
-                request.AddSubResource("response-content-language", StringUtils.FromString(publicRequest.ResponseContentLanguage));
-            
-            if (publicRequest.IsSetResponseContentType())
-                request.AddSubResource("response-content-type", StringUtils.FromString(publicRequest.ResponseContentType));
-            
-            if (publicRequest.IsSetResponseExpires())
-                request.AddSubResource("response-expires", StringUtils.FromDateTimeToRFC822(publicRequest.ResponseExpires));
-            
-            if (publicRequest.IsSetVersionId())
-                request.AddSubResource("versionId", StringUtils.FromString(publicRequest.VersionId));
-            request.ResourcePath = "/{Key+}";
-
-            PostMarshallCustomization(request, publicRequest);
-            request.UseQueryString = true;
-            return request;
-        }
-        private static GetObjectMetadataRequestMarshaller _instance = new GetObjectMetadataRequestMarshaller();        
-
-        internal static GetObjectMetadataRequestMarshaller GetInstance()
-        {
-            return _instance;
-        }
-
-        /// <summary>
-        /// Gets the singleton.
-        /// </summary>  
-        public static GetObjectMetadataRequestMarshaller Instance
-        {
-            get
-            {
-                return _instance;
-            }
-        }
-
-        partial void PostMarshallCustomization(DefaultRequest defaultRequest, GetObjectMetadataRequest publicRequest);
-    }    
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectMetadataResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectMetadataResponseUnmarshaller.cs
deleted file mode 100644
index edb00da0b342..000000000000
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectMetadataResponseUnmarshaller.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Xml.Serialization;
-
-using Amazon.S3.Model;
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-using Amazon.Runtime.Internal.Transform;
-using Amazon.Runtime.Internal.Util;
-
-#pragma warning disable CS0612,CS0618
-namespace Amazon.S3.Model.Internal.MarshallTransformations
-{
-    /// <summary>
-    /// Response Unmarshaller for GetObjectMetadata operation
-    /// </summary>  
-    public partial class GetObjectMetadataResponseUnmarshaller : S3ReponseUnmarshaller
-    {
-        /// <summary>
-        /// Unmarshaller the response from the service to the response class.
-        /// </summary>  
-        /// <param name="context"></param>
-        /// <returns></returns>
-        public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext context)
-        {
-            GetObjectMetadataResponse response = new GetObjectMetadataResponse();
-            if (context.ResponseData.IsHeaderPresent("accept-ranges"))
-                response.AcceptRanges = context.ResponseData.GetHeaderValue("accept-ranges");
-            if (context.ResponseData.IsHeaderPresent("x-amz-archive-status"))
-                response.ArchiveStatus = context.ResponseData.GetHeaderValue("x-amz-archive-status");
-            if (context.ResponseData.IsHeaderPresent("x-amz-server-side-encryption-bucket-key-enabled"))
-                response.BucketKeyEnabled = bool.Parse(context.ResponseData.GetHeaderValue("x-amz-server-side-encryption-bucket-key-enabled"));
-            if (context.ResponseData.IsHeaderPresent("Cache-Control"))
-                response.CacheControl = context.ResponseData.GetHeaderValue("Cache-Control");
-            if (context.ResponseData.IsHeaderPresent("x-amz-checksum-crc32"))
-                response.ChecksumCRC32 = context.ResponseData.GetHeaderValue("x-amz-checksum-crc32");
-            if (context.ResponseData.IsHeaderPresent("x-amz-checksum-crc32c"))
-                response.ChecksumCRC32C = context.ResponseData.GetHeaderValue("x-amz-checksum-crc32c");
-            if (context.ResponseData.IsHeaderPresent("x-amz-checksum-crc64nvme"))
-                response.ChecksumCRC64NVME = context.ResponseData.GetHeaderValue("x-amz-checksum-crc64nvme");
-            if (context.ResponseData.IsHeaderPresent("x-amz-checksum-sha1"))
-                response.ChecksumSHA1 = context.ResponseData.GetHeaderValue("x-amz-checksum-sha1");
-            if (context.ResponseData.IsHeaderPresent("x-amz-checksum-sha256"))
-                response.ChecksumSHA256 = context.ResponseData.GetHeaderValue("x-amz-checksum-sha256");
-            if (context.ResponseData.IsHeaderPresent("x-amz-checksum-type"))
-                response.ChecksumType = context.ResponseData.GetHeaderValue("x-amz-checksum-type");
-            if (context.ResponseData.IsHeaderPresent("Content-Disposition"))
-                response.ContentDisposition = context.ResponseData.GetHeaderValue("Content-Disposition");
-            if (context.ResponseData.IsHeaderPresent("Content-Encoding"))
-                response.ContentEncoding = context.ResponseData.GetHeaderValue("Content-Encoding");
-            if (context.ResponseData.IsHeaderPresent("Content-Language"))
-                response.ContentLanguage = context.ResponseData.GetHeaderValue("Content-Language");
-            if (context.ResponseData.IsHeaderPresent("Content-Length"))
-                response.ContentLength = long.Parse(context.ResponseData.GetHeaderValue("Content-Length"), CultureInfo.InvariantCulture);
-            if (context.ResponseData.IsHeaderPresent("Content-Range"))
-                response.ContentRange = context.ResponseData.GetHeaderValue("Content-Range");
-            if (context.ResponseData.IsHeaderPresent("Content-Type"))
-                response.ContentType = context.ResponseData.GetHeaderValue("Content-Type");
-            if (context.ResponseData.IsHeaderPresent("ETag"))
-                response.ETag = context.ResponseData.GetHeaderValue("ETag");
-            if (context.ResponseData.IsHeaderPresent("Last-Modified"))
-                response.LastModified = DateTime.Parse(context.ResponseData.GetHeaderValue("Last-Modified"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal);
-            if (context.ResponseData.IsHeaderPresent("x-amz-missing-meta"))
-                response.MissingMeta = int.Parse(context.ResponseData.GetHeaderValue("x-amz-missing-meta"), CultureInfo.InvariantCulture);
-            if (context.ResponseData.IsHeaderPresent("x-amz-object-lock-legal-hold"))
-                response.ObjectLockLegalHoldStatus = context.ResponseData.GetHeaderValue("x-amz-object-lock-legal-hold");
-            if (context.ResponseData.IsHeaderPresent("x-amz-object-lock-mode"))
-                response.ObjectLockMode = context.ResponseData.GetHeaderValue("x-amz-object-lock-mode");
-            if (context.ResponseData.IsHeaderPresent("x-amz-object-lock-retain-until-date"))
-                response.ObjectLockRetainUntilDate = DateTime.Parse(context.ResponseData.GetHeaderValue("x-amz-object-lock-retain-until-date"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal);
-            if (context.ResponseData.IsHeaderPresent("x-amz-mp-parts-count"))
-                response.PartsCount = int.Parse(context.ResponseData.GetHeaderValue("x-amz-mp-parts-count"), CultureInfo.InvariantCulture);
-            if (context.ResponseData.IsHeaderPresent("x-amz-replication-status"))
-                response.ReplicationStatus = context.ResponseData.GetHeaderValue("x-amz-replication-status");
-            if (context.ResponseData.IsHeaderPresent("x-amz-request-charged"))
-                response.RequestCharged = context.ResponseData.GetHeaderValue("x-amz-request-charged");
-            if (context.ResponseData.IsHeaderPresent("x-amz-server-side-encryption-customer-key-MD5"))
-                response.ServerSideEncryptionCustomerProvidedKeyMD5 = context.ResponseData.GetHeaderValue("x-amz-server-side-encryption-customer-key-MD5");
-            if (context.ResponseData.IsHeaderPresent("x-amz-server-side-encryption-aws-kms-key-id"))
-                response.ServerSideEncryptionKeyManagementServiceKeyId = context.ResponseData.GetHeaderValue("x-amz-server-side-encryption-aws-kms-key-id");
-            if (context.ResponseData.IsHeaderPresent("x-amz-storage-class"))
-                response.StorageClass = context.ResponseData.GetHeaderValue("x-amz-storage-class");
-            if (context.ResponseData.IsHeaderPresent("x-amz-tagging-count"))
-                response.TagsCount = int.Parse(context.ResponseData.GetHeaderValue("x-amz-tagging-count"), CultureInfo.InvariantCulture);
-            if (context.ResponseData.IsHeaderPresent("x-amz-version-id"))
-                response.VersionId = context.ResponseData.GetHeaderValue("x-amz-version-id");
-            if (context.ResponseData.IsHeaderPresent("x-amz-website-redirect-location"))
-                response.WebsiteRedirectLocation = context.ResponseData.GetHeaderValue("x-amz-website-redirect-location");
-            
-            PostUnmarshallCustomization(context, response);
-            return response;
-        }        
-  
-
-        /// <summary>
-        /// Unmarshaller error response to exception.
-        /// </summary>  
-        /// <param name="context"></param>
-        /// <param name="innerException"></param>
-        /// <param name="statusCode"></param>
-        /// <returns></returns>
-        public override AmazonServiceException UnmarshallException(XmlUnmarshallerContext context, Exception innerException, HttpStatusCode statusCode)
-        {
-            S3ErrorResponse errorResponse = S3ErrorResponseUnmarshaller.Instance.Unmarshall(context);
-            errorResponse.InnerException = innerException;
-            errorResponse.StatusCode = statusCode;
-
-            var responseBodyBytes = context.GetResponseBodyBytes();
-
-            using (var streamCopy = new MemoryStream(responseBodyBytes))
-            using (var contextCopy = new XmlUnmarshallerContext(streamCopy, false, null))
-            {
-                if (errorResponse.Code != null && errorResponse.Code.Equals("NoSuchKey"))
-                {
-                    return NoSuchKeyExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse);
-                }
-            }
-            return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
-        }
-
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetObjectMetadataResponse response);
-
-        private static GetObjectMetadataResponseUnmarshaller _instance = new GetObjectMetadataResponseUnmarshaller();        
-
-        internal static GetObjectMetadataResponseUnmarshaller GetInstance()
-        {
-            return _instance;
-        }
-
-        /// <summary>
-        /// Gets the singleton.
-        /// </summary>  
-        public static GetObjectMetadataResponseUnmarshaller Instance
-        {
-            get
-            {
-                return _instance;
-            }
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectRetentionResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectRetentionResponseUnmarshaller.cs
index fb28e7571951..d9994475206c 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectRetentionResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectRetentionResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetObjectRetention operation
     /// </summary>  
-    public partial class GetObjectRetentionResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetObjectRetentionResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,7 +48,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             GetObjectRetentionResponse response = new GetObjectRetentionResponse();
             UnmarshallResult(context,response);
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -76,6 +75,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetObjectRe
                     return;
                 }
             }
+          
             return;
         }
   
@@ -102,8 +102,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetObjectRetentionResponse response);
-
         private static GetObjectRetentionResponseUnmarshaller _instance = new GetObjectRetentionResponseUnmarshaller();        
 
         internal static GetObjectRetentionResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectTaggingResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectTaggingResponseUnmarshaller.cs
index 0c8e54bd6d4e..1f0b0931262f 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectTaggingResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetObjectTaggingResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetObjectTagging operation
     /// </summary>  
-    public partial class GetObjectTaggingResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetObjectTaggingResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -50,7 +50,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             if (context.ResponseData.IsHeaderPresent("x-amz-version-id"))
                 response.VersionId = context.ResponseData.GetHeaderValue("x-amz-version-id");
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -84,6 +83,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetObjectTa
                     return;
                 }
             }
+          
             return;
         }
   
@@ -110,8 +110,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetObjectTaggingResponse response);
-
         private static GetObjectTaggingResponseUnmarshaller _instance = new GetObjectTaggingResponseUnmarshaller();        
 
         internal static GetObjectTaggingResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetPublicAccessBlockResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetPublicAccessBlockResponseUnmarshaller.cs
index 69efbb8f15c0..e4a4e487a330 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetPublicAccessBlockResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/GetPublicAccessBlockResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for GetPublicAccessBlock operation
     /// </summary>  
-    public partial class GetPublicAccessBlockResponseUnmarshaller : S3ReponseUnmarshaller
+    public class GetPublicAccessBlockResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,7 +48,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             GetPublicAccessBlockResponse response = new GetPublicAccessBlockResponse();
             UnmarshallResult(context,response);
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -76,6 +75,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, GetPublicAc
                     return;
                 }
             }
+          
             return;
         }
   
@@ -102,8 +102,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, GetPublicAccessBlockResponse response);
-
         private static GetPublicAccessBlockResponseUnmarshaller _instance = new GetPublicAccessBlockResponseUnmarshaller();        
 
         internal static GetPublicAccessBlockResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/HeadBucketResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/HeadBucketResponseUnmarshaller.cs
index 520f5cb23d5d..d237f9f30fde 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/HeadBucketResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/HeadBucketResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for HeadBucket operation
     /// </summary>  
-    public partial class HeadBucketResponseUnmarshaller : S3ReponseUnmarshaller
+    public class HeadBucketResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -57,7 +57,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             if (context.ResponseData.IsHeaderPresent("x-amz-bucket-region"))
                 response.BucketRegion = context.ResponseData.GetHeaderValue("x-amz-bucket-region");
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -88,8 +87,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, HeadBucketResponse response);
-
         private static HeadBucketResponseUnmarshaller _instance = new HeadBucketResponseUnmarshaller();        
 
         internal static HeadBucketResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/InitiateMultipartUploadResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/InitiateMultipartUploadResponseUnmarshaller.cs
index 69f53df29b1e..4b145d16f8c3 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/InitiateMultipartUploadResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/InitiateMultipartUploadResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for InitiateMultipartUpload operation
     /// </summary>  
-    public partial class InitiateMultipartUploadResponseUnmarshaller : S3ReponseUnmarshaller
+    public class InitiateMultipartUploadResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -70,7 +70,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             if (context.ResponseData.IsHeaderPresent("x-amz-server-side-encryption"))
                 response.ServerSideEncryptionMethod = context.ResponseData.GetHeaderValue("x-amz-server-side-encryption");
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -112,6 +111,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, InitiateMul
                     return;
                 }
             }
+          
             return;
         }
   
@@ -138,8 +138,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, InitiateMultipartUploadResponse response);
-
         private static InitiateMultipartUploadResponseUnmarshaller _instance = new InitiateMultipartUploadResponseUnmarshaller();        
 
         internal static InitiateMultipartUploadResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListBucketsResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListBucketsResponseUnmarshaller.cs
index d8c9d68ad949..a6161ee9e185 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListBucketsResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListBucketsResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for ListBuckets operation
     /// </summary>  
-    public partial class ListBucketsResponseUnmarshaller : S3ReponseUnmarshaller
+    public class ListBucketsResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,7 +48,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             ListBucketsResponse response = new ListBucketsResponse();
             UnmarshallResult(context,response);
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -100,6 +99,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, ListBuckets
                     return;
                 }
             }
+          
             return;
         }
   
@@ -126,8 +126,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, ListBucketsResponse response);
-
         private static ListBucketsResponseUnmarshaller _instance = new ListBucketsResponseUnmarshaller();        
 
         internal static ListBucketsResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListDirectoryBucketsResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListDirectoryBucketsResponseUnmarshaller.cs
index bfc5af2fd309..29d3a6b47252 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListDirectoryBucketsResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListDirectoryBucketsResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for ListDirectoryBuckets operation
     /// </summary>  
-    public partial class ListDirectoryBucketsResponseUnmarshaller : S3ReponseUnmarshaller
+    public class ListDirectoryBucketsResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -48,7 +48,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             ListDirectoryBucketsResponse response = new ListDirectoryBucketsResponse();
             UnmarshallResult(context,response);
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -88,6 +87,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, ListDirecto
                     return;
                 }
             }
+          
             return;
         }
   
@@ -114,8 +114,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, ListDirectoryBucketsResponse response);
-
         private static ListDirectoryBucketsResponseUnmarshaller _instance = new ListDirectoryBucketsResponseUnmarshaller();        
 
         internal static ListDirectoryBucketsResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListObjectsV2RequestMarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListObjectsV2RequestMarshaller.cs
deleted file mode 100644
index e34e608ef44f..000000000000
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListObjectsV2RequestMarshaller.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Text;
-using System.Xml.Serialization;
-
-using Amazon.S3.Model;
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-using Amazon.Runtime.Internal.Transform;
-using Amazon.Runtime.Internal.Util;
-using System.Xml;
-
-#pragma warning disable CS0612,CS0618
-namespace Amazon.S3.Model.Internal.MarshallTransformations
-{
-    /// <summary>
-    /// ListObjectsV2 Request Marshaller
-    /// </summary>       
-    public partial class ListObjectsV2RequestMarshaller : IMarshaller<IRequest, ListObjectsV2Request> , IMarshaller<IRequest,AmazonWebServiceRequest>
-    {
-        /// <summary>
-        /// Marshaller the request object to the HTTP request.
-        /// </summary>  
-        /// <param name="input"></param>
-        /// <returns></returns>
-        public IRequest Marshall(AmazonWebServiceRequest input)
-        {
-            return this.Marshall((ListObjectsV2Request)input);
-        }
-
-        /// <summary>
-        /// Marshaller the request object to the HTTP request.
-        /// </summary>  
-        /// <param name="publicRequest"></param>
-        /// <returns></returns>
-        public IRequest Marshall(ListObjectsV2Request publicRequest)
-        {
-            var request = new DefaultRequest(publicRequest, "Amazon.S3");
-            request.HttpMethod = "GET";
-            request.AddSubResource("list-type", "2");
-        
-            if (publicRequest.IsSetExpectedBucketOwner()) 
-            {
-                request.Headers["x-amz-expected-bucket-owner"] = publicRequest.ExpectedBucketOwner;
-            }
-        
-            if (publicRequest.IsSetOptionalObjectAttributes()) 
-            {
-                        request.Headers["x-amz-optional-object-attributes"] = StringUtils.FromList(publicRequest.OptionalObjectAttributes);
-            }
-        
-            if (publicRequest.IsSetRequestPayer()) 
-            {
-                request.Headers["x-amz-request-payer"] = publicRequest.RequestPayer;
-            }
-            if (string.IsNullOrEmpty(publicRequest.BucketName))
-                throw new System.ArgumentException("BucketName is a required property and must be set before making this call.", "ListObjectsV2Request.BucketName");
-            
-            if (publicRequest.IsSetContinuationToken())
-                request.Parameters.Add("continuation-token", StringUtils.FromString(publicRequest.ContinuationToken));
-            
-            if (publicRequest.IsSetDelimiter())
-                request.Parameters.Add("delimiter", StringUtils.FromString(publicRequest.Delimiter));
-            
-            if (publicRequest.IsSetEncoding())
-                request.Parameters.Add("encoding-type", StringUtils.FromString(publicRequest.Encoding));
-            
-            if (publicRequest.IsSetFetchOwner())
-                request.Parameters.Add("fetch-owner", StringUtils.FromBool(publicRequest.FetchOwner));
-            
-            if (publicRequest.IsSetMaxKeys())
-                request.Parameters.Add("max-keys", StringUtils.FromInt(publicRequest.MaxKeys));
-            
-            if (publicRequest.IsSetPrefix())
-                request.Parameters.Add("prefix", StringUtils.FromString(publicRequest.Prefix));
-            
-            if (publicRequest.IsSetStartAfter())
-                request.Parameters.Add("start-after", StringUtils.FromString(publicRequest.StartAfter));
-            request.ResourcePath = "/";
-
-            PostMarshallCustomization(request, publicRequest);
-            request.UseQueryString = true;
-            return request;
-        }
-        private static ListObjectsV2RequestMarshaller _instance = new ListObjectsV2RequestMarshaller();        
-
-        internal static ListObjectsV2RequestMarshaller GetInstance()
-        {
-            return _instance;
-        }
-
-        /// <summary>
-        /// Gets the singleton.
-        /// </summary>  
-        public static ListObjectsV2RequestMarshaller Instance
-        {
-            get
-            {
-                return _instance;
-            }
-        }
-
-        partial void PostMarshallCustomization(DefaultRequest defaultRequest, ListObjectsV2Request publicRequest);
-    }    
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListObjectsV2ResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListObjectsV2ResponseUnmarshaller.cs
deleted file mode 100644
index 80d47cf05b62..000000000000
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListObjectsV2ResponseUnmarshaller.cs
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Xml.Serialization;
-
-using Amazon.S3.Model;
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-using Amazon.Runtime.Internal.Transform;
-using Amazon.Runtime.Internal.Util;
-
-#pragma warning disable CS0612,CS0618
-namespace Amazon.S3.Model.Internal.MarshallTransformations
-{
-    /// <summary>
-    /// Response Unmarshaller for ListObjectsV2 operation
-    /// </summary>  
-    public partial class ListObjectsV2ResponseUnmarshaller : S3ReponseUnmarshaller
-    {
-        /// <summary>
-        /// Unmarshaller the response from the service to the response class.
-        /// </summary>  
-        /// <param name="context"></param>
-        /// <returns></returns>
-        public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext context)
-        {
-            ListObjectsV2Response response = new ListObjectsV2Response();
-            UnmarshallResult(context,response);
-            if (context.ResponseData.IsHeaderPresent("x-amz-request-charged"))
-                response.RequestCharged = context.ResponseData.GetHeaderValue("x-amz-request-charged");
-            
-            PostUnmarshallCustomization(context, response);
-            return response;
-        }        
-
-        private static void UnmarshallResult(XmlUnmarshallerContext context, ListObjectsV2Response response)
-        {
-            int originalDepth = context.CurrentDepth;
-            int targetDepth = originalDepth + 1;
-            if (context.IsStartOfDocument) 
-                   targetDepth += 1;
-            if (context.IsEmptyResponse)
-            {
-                return;
-            }
-            while (context.Read())
-            {
-                if (context.IsStartElement || context.IsAttribute)
-                {
-                    if (context.TestExpression("CommonPrefixes", targetDepth))
-                    {
-                        if (response.CommonPrefixes == null)
-                        {
-                            response.CommonPrefixes = new List<string>();
-                        }
-                        var unmarshaller = CommonPrefixesItemUnmarshaller.Instance;
-                        response.CommonPrefixes.Add(unmarshaller.Unmarshall(context));
-                        continue;
-                    }
-                    if (context.TestExpression("ContinuationToken", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        response.ContinuationToken = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("Delimiter", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        response.Delimiter = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("EncodingType", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        response.Encoding = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("IsTruncated", targetDepth))
-                    {
-                        var unmarshaller = NullableBoolUnmarshaller.Instance;
-                        response.IsTruncated = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("KeyCount", targetDepth))
-                    {
-                        var unmarshaller = NullableIntUnmarshaller.Instance;
-                        response.KeyCount = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("MaxKeys", targetDepth))
-                    {
-                        var unmarshaller = NullableIntUnmarshaller.Instance;
-                        response.MaxKeys = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("Name", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        response.Name = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("NextContinuationToken", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        response.NextContinuationToken = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("Prefix", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        response.Prefix = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("Contents", targetDepth))
-                    {
-                        CustomContentsUnmarshall(context, response);
-                        continue;
-                    }
-                    if (context.TestExpression("StartAfter", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        response.StartAfter = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                }
-                else if (context.IsEndElement && context.CurrentDepth < originalDepth)
-                {
-                    return;
-                }
-            }
-            return;
-        }
-  
-
-        /// <summary>
-        /// Unmarshaller error response to exception.
-        /// </summary>  
-        /// <param name="context"></param>
-        /// <param name="innerException"></param>
-        /// <param name="statusCode"></param>
-        /// <returns></returns>
-        public override AmazonServiceException UnmarshallException(XmlUnmarshallerContext context, Exception innerException, HttpStatusCode statusCode)
-        {
-            S3ErrorResponse errorResponse = S3ErrorResponseUnmarshaller.Instance.Unmarshall(context);
-            errorResponse.InnerException = innerException;
-            errorResponse.StatusCode = statusCode;
-
-            var responseBodyBytes = context.GetResponseBodyBytes();
-
-            using (var streamCopy = new MemoryStream(responseBodyBytes))
-            using (var contextCopy = new XmlUnmarshallerContext(streamCopy, false, null))
-            {
-                if (errorResponse.Code != null && errorResponse.Code.Equals("NoSuchBucket"))
-                {
-                    return NoSuchBucketExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse);
-                }
-            }
-            return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
-        }
-
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, ListObjectsV2Response response);
-
-        private static ListObjectsV2ResponseUnmarshaller _instance = new ListObjectsV2ResponseUnmarshaller();        
-
-        internal static ListObjectsV2ResponseUnmarshaller GetInstance()
-        {
-            return _instance;
-        }
-
-        /// <summary>
-        /// Gets the singleton.
-        /// </summary>  
-        public static ListObjectsV2ResponseUnmarshaller Instance
-        {
-            get
-            {
-                return _instance;
-            }
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListPartsResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListPartsResponseUnmarshaller.cs
index 894bf5a8a101..c792d1cf20da 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListPartsResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListPartsResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for ListParts operation
     /// </summary>  
-    public partial class ListPartsResponseUnmarshaller : S3ReponseUnmarshaller
+    public class ListPartsResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -54,7 +54,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             if (context.ResponseData.IsHeaderPresent("x-amz-request-charged"))
                 response.RequestCharged = context.ResponseData.GetHeaderValue("x-amz-request-charged");
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
 
@@ -160,6 +159,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, ListPartsRe
                     return;
                 }
             }
+          
             return;
         }
   
@@ -186,8 +186,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, ListPartsResponse response);
-
         private static ListPartsResponseUnmarshaller _instance = new ListPartsResponseUnmarshaller();        
 
         internal static ListPartsResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListVersionsRequestMarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListVersionsRequestMarshaller.cs
deleted file mode 100644
index 8f9ee0b748e5..000000000000
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListVersionsRequestMarshaller.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Text;
-using System.Xml.Serialization;
-
-using Amazon.S3.Model;
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-using Amazon.Runtime.Internal.Transform;
-using Amazon.Runtime.Internal.Util;
-using System.Xml;
-
-#pragma warning disable CS0612,CS0618
-namespace Amazon.S3.Model.Internal.MarshallTransformations
-{
-    /// <summary>
-    /// ListVersions Request Marshaller
-    /// </summary>       
-    public partial class ListVersionsRequestMarshaller : IMarshaller<IRequest, ListVersionsRequest> , IMarshaller<IRequest,AmazonWebServiceRequest>
-    {
-        /// <summary>
-        /// Marshaller the request object to the HTTP request.
-        /// </summary>  
-        /// <param name="input"></param>
-        /// <returns></returns>
-        public IRequest Marshall(AmazonWebServiceRequest input)
-        {
-            return this.Marshall((ListVersionsRequest)input);
-        }
-
-        /// <summary>
-        /// Marshaller the request object to the HTTP request.
-        /// </summary>  
-        /// <param name="publicRequest"></param>
-        /// <returns></returns>
-        public IRequest Marshall(ListVersionsRequest publicRequest)
-        {
-            var request = new DefaultRequest(publicRequest, "Amazon.S3");
-            request.HttpMethod = "GET";
-            request.AddSubResource("versions");
-        
-            if (publicRequest.IsSetExpectedBucketOwner()) 
-            {
-                request.Headers["x-amz-expected-bucket-owner"] = publicRequest.ExpectedBucketOwner;
-            }
-        
-            if (publicRequest.IsSetOptionalObjectAttributes()) 
-            {
-                        request.Headers["x-amz-optional-object-attributes"] = StringUtils.FromList(publicRequest.OptionalObjectAttributes);
-            }
-        
-            if (publicRequest.IsSetRequestPayer()) 
-            {
-                request.Headers["x-amz-request-payer"] = publicRequest.RequestPayer;
-            }
-            if (string.IsNullOrEmpty(publicRequest.BucketName))
-                throw new System.ArgumentException("BucketName is a required property and must be set before making this call.", "ListVersionsRequest.BucketName");
-            
-            if (publicRequest.IsSetDelimiter())
-                request.Parameters.Add("delimiter", StringUtils.FromString(publicRequest.Delimiter));
-            
-            if (publicRequest.IsSetEncoding())
-                request.Parameters.Add("encoding-type", StringUtils.FromString(publicRequest.Encoding));
-            
-            if (publicRequest.IsSetKeyMarker())
-                request.Parameters.Add("key-marker", StringUtils.FromString(publicRequest.KeyMarker));
-            
-            if (publicRequest.IsSetMaxKeys())
-                request.Parameters.Add("max-keys", StringUtils.FromInt(publicRequest.MaxKeys));
-            
-            if (publicRequest.IsSetPrefix())
-                request.Parameters.Add("prefix", StringUtils.FromString(publicRequest.Prefix));
-            
-            if (publicRequest.IsSetVersionIdMarker())
-                request.Parameters.Add("version-id-marker", StringUtils.FromString(publicRequest.VersionIdMarker));
-            request.ResourcePath = "/";
-
-            PostMarshallCustomization(request, publicRequest);
-            request.UseQueryString = true;
-            return request;
-        }
-        private static ListVersionsRequestMarshaller _instance = new ListVersionsRequestMarshaller();        
-
-        internal static ListVersionsRequestMarshaller GetInstance()
-        {
-            return _instance;
-        }
-
-        /// <summary>
-        /// Gets the singleton.
-        /// </summary>  
-        public static ListVersionsRequestMarshaller Instance
-        {
-            get
-            {
-                return _instance;
-            }
-        }
-
-        partial void PostMarshallCustomization(DefaultRequest defaultRequest, ListVersionsRequest publicRequest);
-    }    
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListVersionsResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListVersionsResponseUnmarshaller.cs
deleted file mode 100644
index 4a3b6240fdb5..000000000000
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ListVersionsResponseUnmarshaller.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Xml.Serialization;
-
-using Amazon.S3.Model;
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-using Amazon.Runtime.Internal.Transform;
-using Amazon.Runtime.Internal.Util;
-
-#pragma warning disable CS0612,CS0618
-namespace Amazon.S3.Model.Internal.MarshallTransformations
-{
-    /// <summary>
-    /// Response Unmarshaller for ListVersions operation
-    /// </summary>  
-    public partial class ListVersionsResponseUnmarshaller : S3ReponseUnmarshaller
-    {
-        /// <summary>
-        /// Unmarshaller the response from the service to the response class.
-        /// </summary>  
-        /// <param name="context"></param>
-        /// <returns></returns>
-        public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext context)
-        {
-            ListVersionsResponse response = new ListVersionsResponse();
-            UnmarshallResult(context,response);
-            if (context.ResponseData.IsHeaderPresent("x-amz-request-charged"))
-                response.RequestCharged = context.ResponseData.GetHeaderValue("x-amz-request-charged");
-            
-            PostUnmarshallCustomization(context, response);
-            return response;
-        }        
-
-        private static void UnmarshallResult(XmlUnmarshallerContext context, ListVersionsResponse response)
-        {
-            int originalDepth = context.CurrentDepth;
-            int targetDepth = originalDepth + 1;
-            if (context.IsStartOfDocument) 
-                   targetDepth += 1;
-            if (context.IsEmptyResponse)
-            {
-                return;
-            }
-            while (context.Read())
-            {
-                if (context.IsStartElement || context.IsAttribute)
-                {
-                    if (context.TestExpression("CommonPrefixes", targetDepth))
-                    {
-                        if (response.CommonPrefixes == null)
-                        {
-                            response.CommonPrefixes = new List<string>();
-                        }
-                        var unmarshaller = CommonPrefixesItemUnmarshaller.Instance;
-                        response.CommonPrefixes.Add(unmarshaller.Unmarshall(context));
-                        continue;
-                    }
-                    if (context.TestExpression("DeleteMarker", targetDepth))
-                    {
-                        DeleteItemCustomUnmarshall(context, response);
-                        continue;
-                    }
-                    if (context.TestExpression("Delimiter", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        response.Delimiter = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("EncodingType", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        response.Encoding = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("IsTruncated", targetDepth))
-                    {
-                        var unmarshaller = NullableBoolUnmarshaller.Instance;
-                        response.IsTruncated = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("KeyMarker", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        response.KeyMarker = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("MaxKeys", targetDepth))
-                    {
-                        var unmarshaller = NullableIntUnmarshaller.Instance;
-                        response.MaxKeys = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("Name", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        response.Name = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("NextKeyMarker", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        response.NextKeyMarker = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("NextVersionIdMarker", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        response.NextVersionIdMarker = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("Prefix", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        response.Prefix = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("VersionIdMarker", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        response.VersionIdMarker = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("Version", targetDepth))
-                    {
-                        VersionsItemCustomUnmarshall(context, response);
-                        continue;
-                    }
-                }
-                else if (context.IsEndElement && context.CurrentDepth < originalDepth)
-                {
-                    return;
-                }
-            }
-            return;
-        }
-  
-
-        /// <summary>
-        /// Unmarshaller error response to exception.
-        /// </summary>  
-        /// <param name="context"></param>
-        /// <param name="innerException"></param>
-        /// <param name="statusCode"></param>
-        /// <returns></returns>
-        public override AmazonServiceException UnmarshallException(XmlUnmarshallerContext context, Exception innerException, HttpStatusCode statusCode)
-        {
-            S3ErrorResponse errorResponse = S3ErrorResponseUnmarshaller.Instance.Unmarshall(context);
-            errorResponse.InnerException = innerException;
-            errorResponse.StatusCode = statusCode;
-
-            var responseBodyBytes = context.GetResponseBodyBytes();
-
-            using (var streamCopy = new MemoryStream(responseBodyBytes))
-            using (var contextCopy = new XmlUnmarshallerContext(streamCopy, false, null))
-            {
-            }
-            return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
-        }
-
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, ListVersionsResponse response);
-
-        private static ListVersionsResponseUnmarshaller _instance = new ListVersionsResponseUnmarshaller();        
-
-        internal static ListVersionsResponseUnmarshaller GetInstance()
-        {
-            return _instance;
-        }
-
-        /// <summary>
-        /// Gets the singleton.
-        /// </summary>  
-        public static ListVersionsResponseUnmarshaller Instance
-        {
-            get
-            {
-                return _instance;
-            }
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketEncryptionRequestMarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketEncryptionRequestMarshaller.cs
index c7402ef4dc57..6914d7723d58 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketEncryptionRequestMarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketEncryptionRequestMarshaller.cs
@@ -115,6 +115,8 @@ public IRequest Marshall(PutBucketEncryptionRequest publicRequest)
                 string content = stringWriter.ToString();
                 request.Content = System.Text.Encoding.UTF8.GetBytes(content);
                 request.Headers["Content-Type"] = "application/xml";
+                if (publicRequest.IsSetContentMD5())
+                    request.Headers[Amazon.Util.HeaderKeys.ContentMD5Header] = publicRequest.ContentMD5;
                 ChecksumUtils.SetChecksumData(
                     request,
                     publicRequest.ChecksumAlgorithm,
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketEncryptionResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketEncryptionResponseUnmarshaller.cs
index f92ad1db865a..ba640ee35990 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketEncryptionResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketEncryptionResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for PutBucketEncryption operation
     /// </summary>  
-    public partial class PutBucketEncryptionResponseUnmarshaller : S3ReponseUnmarshaller
+    public class PutBucketEncryptionResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -47,7 +47,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
         {
             PutBucketEncryptionResponse response = new PutBucketEncryptionResponse();
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -74,8 +73,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, PutBucketEncryptionResponse response);
-
         private static PutBucketEncryptionResponseUnmarshaller _instance = new PutBucketEncryptionResponseUnmarshaller();        
 
         internal static PutBucketEncryptionResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketNotificationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketNotificationResponseUnmarshaller.cs
index 00431c7ec889..9c305f853340 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketNotificationResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketNotificationResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for PutBucketNotification operation
     /// </summary>  
-    public partial class PutBucketNotificationResponseUnmarshaller : S3ReponseUnmarshaller
+    public class PutBucketNotificationResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -47,7 +47,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
         {
             PutBucketNotificationResponse response = new PutBucketNotificationResponse();
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -74,8 +73,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, PutBucketNotificationResponse response);
-
         private static PutBucketNotificationResponseUnmarshaller _instance = new PutBucketNotificationResponseUnmarshaller();        
 
         internal static PutBucketNotificationResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketPolicyRequestMarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketPolicyRequestMarshaller.cs
index 4d325285e4ad..47b00e8ae725 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketPolicyRequestMarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketPolicyRequestMarshaller.cs
@@ -84,6 +84,8 @@ public IRequest Marshall(PutBucketPolicyRequest publicRequest)
             request.Content = Encoding.UTF8.GetBytes(StringUtils.FromString(publicRequest.Policy));
             request.Headers["Content-Type"] = "text/plain";
             PostMarshallCustomization(request, publicRequest);
+                if (publicRequest.IsSetContentMD5())
+                    request.Headers[Amazon.Util.HeaderKeys.ContentMD5Header] = publicRequest.ContentMD5;
                 ChecksumUtils.SetChecksumData(
                     request,
                     publicRequest.ChecksumAlgorithm,
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketPolicyResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketPolicyResponseUnmarshaller.cs
index aede05c50362..49a8a5fab922 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketPolicyResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketPolicyResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for PutBucketPolicy operation
     /// </summary>  
-    public partial class PutBucketPolicyResponseUnmarshaller : S3ReponseUnmarshaller
+    public class PutBucketPolicyResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -47,7 +47,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
         {
             PutBucketPolicyResponse response = new PutBucketPolicyResponse();
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -74,8 +73,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, PutBucketPolicyResponse response);
-
         private static PutBucketPolicyResponseUnmarshaller _instance = new PutBucketPolicyResponseUnmarshaller();        
 
         internal static PutBucketPolicyResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketReplicationRequestMarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketReplicationRequestMarshaller.cs
index 0600bf1b5180..d7e7f2c6cdcb 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketReplicationRequestMarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketReplicationRequestMarshaller.cs
@@ -245,6 +245,8 @@ public IRequest Marshall(PutBucketReplicationRequest publicRequest)
                 string content = stringWriter.ToString();
                 request.Content = System.Text.Encoding.UTF8.GetBytes(content);
                 request.Headers["Content-Type"] = "application/xml";
+                if (publicRequest.IsSetContentMD5())
+                    request.Headers[Amazon.Util.HeaderKeys.ContentMD5Header] = publicRequest.ContentMD5;
                 ChecksumUtils.SetChecksumData(
                     request,
                     publicRequest.ChecksumAlgorithm,
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketReplicationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketReplicationResponseUnmarshaller.cs
index e7a0a45fa3fc..c0885ff4dd47 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketReplicationResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketReplicationResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for PutBucketReplication operation
     /// </summary>  
-    public partial class PutBucketReplicationResponseUnmarshaller : S3ReponseUnmarshaller
+    public class PutBucketReplicationResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -47,7 +47,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
         {
             PutBucketReplicationResponse response = new PutBucketReplicationResponse();
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -74,8 +73,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, PutBucketReplicationResponse response);
-
         private static PutBucketReplicationResponseUnmarshaller _instance = new PutBucketReplicationResponseUnmarshaller();        
 
         internal static PutBucketReplicationResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketResponseUnmarshaller.cs
index ee9a8aa8a61a..dee0658fa0cf 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutBucketResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for PutBucket operation
     /// </summary>  
-    public partial class PutBucketResponseUnmarshaller : S3ReponseUnmarshaller
+    public class PutBucketResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -51,7 +51,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             if (context.ResponseData.IsHeaderPresent("Location"))
                 response.Location = context.ResponseData.GetHeaderValue("Location");
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -86,8 +85,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, PutBucketResponse response);
-
         private static PutBucketResponseUnmarshaller _instance = new PutBucketResponseUnmarshaller();        
 
         internal static PutBucketResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutCORSConfigurationRequestMarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutCORSConfigurationRequestMarshaller.cs
deleted file mode 100644
index a6b578f62c46..000000000000
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutCORSConfigurationRequestMarshaller.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Text;
-using System.Xml.Serialization;
-
-using Amazon.S3.Model;
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-using Amazon.Runtime.Internal.Transform;
-using Amazon.Runtime.Internal.Util;
-using System.Xml;
-
-#pragma warning disable CS0612,CS0618
-namespace Amazon.S3.Model.Internal.MarshallTransformations
-{
-    /// <summary>
-    /// PutCORSConfiguration Request Marshaller
-    /// </summary>       
-    public partial class PutCORSConfigurationRequestMarshaller : IMarshaller<IRequest, PutCORSConfigurationRequest> , IMarshaller<IRequest,AmazonWebServiceRequest>
-    {
-        /// <summary>
-        /// Marshaller the request object to the HTTP request.
-        /// </summary>  
-        /// <param name="input"></param>
-        /// <returns></returns>
-        public IRequest Marshall(AmazonWebServiceRequest input)
-        {
-            return this.Marshall((PutCORSConfigurationRequest)input);
-        }
-
-        /// <summary>
-        /// Marshaller the request object to the HTTP request.
-        /// </summary>  
-        /// <param name="publicRequest"></param>
-        /// <returns></returns>
-        public IRequest Marshall(PutCORSConfigurationRequest publicRequest)
-        {
-            var request = new DefaultRequest(publicRequest, "Amazon.S3");
-            request.HttpMethod = "PUT";
-            request.AddSubResource("cors");
-        
-            if (publicRequest.IsSetChecksumAlgorithm()) 
-            {
-                request.Headers["x-amz-sdk-checksum-algorithm"] = publicRequest.ChecksumAlgorithm;
-            }
-        
-            if (publicRequest.IsSetContentMD5()) 
-            {
-                request.Headers["Content-MD5"] = publicRequest.ContentMD5;
-            }
-        
-            if (publicRequest.IsSetExpectedBucketOwner()) 
-            {
-                request.Headers["x-amz-expected-bucket-owner"] = publicRequest.ExpectedBucketOwner;
-            }
-            if (string.IsNullOrEmpty(publicRequest.BucketName))
-                throw new System.ArgumentException("BucketName is a required property and must be set before making this call.", "PutCORSConfigurationRequest.BucketName");
-            request.ResourcePath = "/";
-            var stringWriter = new XMLEncodedStringWriter(CultureInfo.InvariantCulture);
-            using (var xmlWriter = XmlWriter.Create(stringWriter, new XmlWriterSettings() { Encoding = System.Text.Encoding.UTF8, OmitXmlDeclaration = true, NewLineHandling = NewLineHandling.Entitize }))
-            {   
-                if (publicRequest.IsSetConfiguration())
-                {
-                    xmlWriter.WriteStartElement("CORSConfiguration", "http://s3.amazonaws.com/doc/2006-03-01/");
-                    var publicRequestConfigurationRules = publicRequest.Configuration.Rules;
-                    if (publicRequestConfigurationRules != null && (publicRequestConfigurationRules.Count > 0 || !AWSConfigs.InitializeCollections)) 
-                    {
-                        foreach (var publicRequestConfigurationRulesValue in publicRequestConfigurationRules) 
-                        {
-                        if (publicRequestConfigurationRulesValue != null)
-                        {
-                            xmlWriter.WriteStartElement("CORSRule");
-                            var publicRequestConfigurationRulesValueAllowedHeaders = publicRequestConfigurationRulesValue.AllowedHeaders;
-                            if (publicRequestConfigurationRulesValueAllowedHeaders != null && (publicRequestConfigurationRulesValueAllowedHeaders.Count > 0 || !AWSConfigs.InitializeCollections)) 
-                            {
-                                foreach (var publicRequestConfigurationRulesValueAllowedHeadersValue in publicRequestConfigurationRulesValueAllowedHeaders) 
-                                {
-                                    xmlWriter.WriteStartElement("AllowedHeader");
-                                    xmlWriter.WriteValue(publicRequestConfigurationRulesValueAllowedHeadersValue);
-                                    xmlWriter.WriteEndElement();
-                                }            
-                            }
-                            var publicRequestConfigurationRulesValueAllowedMethods = publicRequestConfigurationRulesValue.AllowedMethods;
-                            if (publicRequestConfigurationRulesValueAllowedMethods != null && (publicRequestConfigurationRulesValueAllowedMethods.Count > 0 || !AWSConfigs.InitializeCollections)) 
-                            {
-                                foreach (var publicRequestConfigurationRulesValueAllowedMethodsValue in publicRequestConfigurationRulesValueAllowedMethods) 
-                                {
-                                    xmlWriter.WriteStartElement("AllowedMethod");
-                                    xmlWriter.WriteValue(publicRequestConfigurationRulesValueAllowedMethodsValue);
-                                    xmlWriter.WriteEndElement();
-                                }            
-                            }
-                            var publicRequestConfigurationRulesValueAllowedOrigins = publicRequestConfigurationRulesValue.AllowedOrigins;
-                            if (publicRequestConfigurationRulesValueAllowedOrigins != null && (publicRequestConfigurationRulesValueAllowedOrigins.Count > 0 || !AWSConfigs.InitializeCollections)) 
-                            {
-                                foreach (var publicRequestConfigurationRulesValueAllowedOriginsValue in publicRequestConfigurationRulesValueAllowedOrigins) 
-                                {
-                                    xmlWriter.WriteStartElement("AllowedOrigin");
-                                    xmlWriter.WriteValue(publicRequestConfigurationRulesValueAllowedOriginsValue);
-                                    xmlWriter.WriteEndElement();
-                                }            
-                            }
-                            var publicRequestConfigurationRulesValueExposeHeaders = publicRequestConfigurationRulesValue.ExposeHeaders;
-                            if (publicRequestConfigurationRulesValueExposeHeaders != null && (publicRequestConfigurationRulesValueExposeHeaders.Count > 0 || !AWSConfigs.InitializeCollections)) 
-                            {
-                                foreach (var publicRequestConfigurationRulesValueExposeHeadersValue in publicRequestConfigurationRulesValueExposeHeaders) 
-                                {
-                                    xmlWriter.WriteStartElement("ExposeHeader");
-                                    xmlWriter.WriteValue(publicRequestConfigurationRulesValueExposeHeadersValue);
-                                    xmlWriter.WriteEndElement();
-                                }            
-                            }
-                            if(publicRequestConfigurationRulesValue.IsSetId())
-                                xmlWriter.WriteElementString("ID", StringUtils.FromString(publicRequestConfigurationRulesValue.Id));
-                            if(publicRequestConfigurationRulesValue.IsSetMaxAgeSeconds())
-                                xmlWriter.WriteElementString("MaxAgeSeconds", StringUtils.FromInt(publicRequestConfigurationRulesValue.MaxAgeSeconds.Value));
-                            xmlWriter.WriteEndElement();
-                        }
-                        }            
-                    }
-
-                    xmlWriter.WriteEndElement();
-                }
-            }
-            PostMarshallCustomization(request, publicRequest);
-            try 
-            {
-                string content = stringWriter.ToString();
-                request.Content = System.Text.Encoding.UTF8.GetBytes(content);
-                request.Headers["Content-Type"] = "application/xml";
-                ChecksumUtils.SetChecksumData(
-                    request,
-                    publicRequest.ChecksumAlgorithm,
-                    fallbackToMD5: false,
-                    isRequestChecksumRequired: true,
-                    headerName: "x-amz-sdk-checksum-algorithm"
-                );
-                request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2006-03-01";            
-            } 
-            catch (EncoderFallbackException e) 
-            {
-                throw new AmazonServiceException("Unable to marshall request to XML", e);
-            }
-            return request;
-        }
-        private static PutCORSConfigurationRequestMarshaller _instance = new PutCORSConfigurationRequestMarshaller();        
-
-        internal static PutCORSConfigurationRequestMarshaller GetInstance()
-        {
-            return _instance;
-        }
-
-        /// <summary>
-        /// Gets the singleton.
-        /// </summary>  
-        public static PutCORSConfigurationRequestMarshaller Instance
-        {
-            get
-            {
-                return _instance;
-            }
-        }
-
-        partial void PostMarshallCustomization(DefaultRequest defaultRequest, PutCORSConfigurationRequest publicRequest);
-    }    
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutCORSConfigurationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutCORSConfigurationResponseUnmarshaller.cs
deleted file mode 100644
index ced5fe7e3a4f..000000000000
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutCORSConfigurationResponseUnmarshaller.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Xml.Serialization;
-
-using Amazon.S3.Model;
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-using Amazon.Runtime.Internal.Transform;
-using Amazon.Runtime.Internal.Util;
-
-#pragma warning disable CS0612,CS0618
-namespace Amazon.S3.Model.Internal.MarshallTransformations
-{
-    /// <summary>
-    /// Response Unmarshaller for PutCORSConfiguration operation
-    /// </summary>  
-    public partial class PutCORSConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
-    {
-        /// <summary>
-        /// Unmarshaller the response from the service to the response class.
-        /// </summary>  
-        /// <param name="context"></param>
-        /// <returns></returns>
-        public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext context)
-        {
-            PutCORSConfigurationResponse response = new PutCORSConfigurationResponse();
-            
-            PostUnmarshallCustomization(context, response);
-            return response;
-        }        
-  
-
-        /// <summary>
-        /// Unmarshaller error response to exception.
-        /// </summary>  
-        /// <param name="context"></param>
-        /// <param name="innerException"></param>
-        /// <param name="statusCode"></param>
-        /// <returns></returns>
-        public override AmazonServiceException UnmarshallException(XmlUnmarshallerContext context, Exception innerException, HttpStatusCode statusCode)
-        {
-            S3ErrorResponse errorResponse = S3ErrorResponseUnmarshaller.Instance.Unmarshall(context);
-            errorResponse.InnerException = innerException;
-            errorResponse.StatusCode = statusCode;
-
-            var responseBodyBytes = context.GetResponseBodyBytes();
-
-            using (var streamCopy = new MemoryStream(responseBodyBytes))
-            using (var contextCopy = new XmlUnmarshallerContext(streamCopy, false, null))
-            {
-            }
-            return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
-        }
-
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, PutCORSConfigurationResponse response);
-
-        private static PutCORSConfigurationResponseUnmarshaller _instance = new PutCORSConfigurationResponseUnmarshaller();        
-
-        internal static PutCORSConfigurationResponseUnmarshaller GetInstance()
-        {
-            return _instance;
-        }
-
-        /// <summary>
-        /// Gets the singleton.
-        /// </summary>  
-        public static PutCORSConfigurationResponseUnmarshaller Instance
-        {
-            get
-            {
-                return _instance;
-            }
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutLifecycleConfigurationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutLifecycleConfigurationResponseUnmarshaller.cs
index 504602752695..00ebb272f5bf 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutLifecycleConfigurationResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutLifecycleConfigurationResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for PutLifecycleConfiguration operation
     /// </summary>  
-    public partial class PutLifecycleConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
+    public class PutLifecycleConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -49,7 +49,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             if (context.ResponseData.IsHeaderPresent("x-amz-transition-default-minimum-object-size"))
                 response.TransitionDefaultMinimumObjectSize = context.ResponseData.GetHeaderValue("x-amz-transition-default-minimum-object-size");
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -76,8 +75,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, PutLifecycleConfigurationResponse response);
-
         private static PutLifecycleConfigurationResponseUnmarshaller _instance = new PutLifecycleConfigurationResponseUnmarshaller();        
 
         internal static PutLifecycleConfigurationResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectLegalHoldRequestMarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectLegalHoldRequestMarshaller.cs
index fdf973069cc9..34888cb1de5b 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectLegalHoldRequestMarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectLegalHoldRequestMarshaller.cs
@@ -106,6 +106,8 @@ public IRequest Marshall(PutObjectLegalHoldRequest publicRequest)
                 string content = stringWriter.ToString();
                 request.Content = System.Text.Encoding.UTF8.GetBytes(content);
                 request.Headers["Content-Type"] = "application/xml";
+                if (publicRequest.IsSetContentMD5())
+                    request.Headers[Amazon.Util.HeaderKeys.ContentMD5Header] = publicRequest.ContentMD5;
                 ChecksumUtils.SetChecksumData(
                     request,
                     publicRequest.ChecksumAlgorithm,
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectLegalHoldResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectLegalHoldResponseUnmarshaller.cs
index a8cda5916de0..674a2b4df928 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectLegalHoldResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectLegalHoldResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for PutObjectLegalHold operation
     /// </summary>  
-    public partial class PutObjectLegalHoldResponseUnmarshaller : S3ReponseUnmarshaller
+    public class PutObjectLegalHoldResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -49,7 +49,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             if (context.ResponseData.IsHeaderPresent("x-amz-request-charged"))
                 response.RequestCharged = context.ResponseData.GetHeaderValue("x-amz-request-charged");
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -76,8 +75,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, PutObjectLegalHoldResponse response);
-
         private static PutObjectLegalHoldResponseUnmarshaller _instance = new PutObjectLegalHoldResponseUnmarshaller();        
 
         internal static PutObjectLegalHoldResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectLockConfigurationRequestMarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectLockConfigurationRequestMarshaller.cs
index 60c7fe3b327d..b43dc1bdc71d 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectLockConfigurationRequestMarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectLockConfigurationRequestMarshaller.cs
@@ -121,6 +121,8 @@ public IRequest Marshall(PutObjectLockConfigurationRequest publicRequest)
                 string content = stringWriter.ToString();
                 request.Content = System.Text.Encoding.UTF8.GetBytes(content);
                 request.Headers["Content-Type"] = "application/xml";
+                if (publicRequest.IsSetContentMD5())
+                    request.Headers[Amazon.Util.HeaderKeys.ContentMD5Header] = publicRequest.ContentMD5;
                 ChecksumUtils.SetChecksumData(
                     request,
                     publicRequest.ChecksumAlgorithm,
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectLockConfigurationResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectLockConfigurationResponseUnmarshaller.cs
index 838a6774b86a..2eb487c33469 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectLockConfigurationResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectLockConfigurationResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for PutObjectLockConfiguration operation
     /// </summary>  
-    public partial class PutObjectLockConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
+    public class PutObjectLockConfigurationResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -49,7 +49,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             if (context.ResponseData.IsHeaderPresent("x-amz-request-charged"))
                 response.RequestCharged = context.ResponseData.GetHeaderValue("x-amz-request-charged");
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -76,8 +75,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, PutObjectLockConfigurationResponse response);
-
         private static PutObjectLockConfigurationResponseUnmarshaller _instance = new PutObjectLockConfigurationResponseUnmarshaller();        
 
         internal static PutObjectLockConfigurationResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectRetentionRequestMarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectRetentionRequestMarshaller.cs
index 9c0e4f7aa990..374d0d03590b 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectRetentionRequestMarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectRetentionRequestMarshaller.cs
@@ -114,6 +114,8 @@ public IRequest Marshall(PutObjectRetentionRequest publicRequest)
                 string content = stringWriter.ToString();
                 request.Content = System.Text.Encoding.UTF8.GetBytes(content);
                 request.Headers["Content-Type"] = "application/xml";
+                if (publicRequest.IsSetContentMD5())
+                    request.Headers[Amazon.Util.HeaderKeys.ContentMD5Header] = publicRequest.ContentMD5;
                 ChecksumUtils.SetChecksumData(
                     request,
                     publicRequest.ChecksumAlgorithm,
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectRetentionResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectRetentionResponseUnmarshaller.cs
index d489b4926f9e..a292cd331177 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectRetentionResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectRetentionResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for PutObjectRetention operation
     /// </summary>  
-    public partial class PutObjectRetentionResponseUnmarshaller : S3ReponseUnmarshaller
+    public class PutObjectRetentionResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -49,7 +49,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             if (context.ResponseData.IsHeaderPresent("x-amz-request-charged"))
                 response.RequestCharged = context.ResponseData.GetHeaderValue("x-amz-request-charged");
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -76,8 +75,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, PutObjectRetentionResponse response);
-
         private static PutObjectRetentionResponseUnmarshaller _instance = new PutObjectRetentionResponseUnmarshaller();        
 
         internal static PutObjectRetentionResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectTaggingRequestMarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectTaggingRequestMarshaller.cs
index 02c07741a565..ce8b52bbe719 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectTaggingRequestMarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectTaggingRequestMarshaller.cs
@@ -121,6 +121,8 @@ public IRequest Marshall(PutObjectTaggingRequest publicRequest)
                 string content = stringWriter.ToString();
                 request.Content = System.Text.Encoding.UTF8.GetBytes(content);
                 request.Headers["Content-Type"] = "application/xml";
+                if (publicRequest.IsSetContentMD5())
+                    request.Headers[Amazon.Util.HeaderKeys.ContentMD5Header] = publicRequest.ContentMD5;
                 ChecksumUtils.SetChecksumData(
                     request,
                     publicRequest.ChecksumAlgorithm,
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectTaggingResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectTaggingResponseUnmarshaller.cs
index 87bdb5f09e2c..af659611a62d 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectTaggingResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutObjectTaggingResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for PutObjectTagging operation
     /// </summary>  
-    public partial class PutObjectTaggingResponseUnmarshaller : S3ReponseUnmarshaller
+    public class PutObjectTaggingResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -49,7 +49,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             if (context.ResponseData.IsHeaderPresent("x-amz-version-id"))
                 response.VersionId = context.ResponseData.GetHeaderValue("x-amz-version-id");
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -76,8 +75,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, PutObjectTaggingResponse response);
-
         private static PutObjectTaggingResponseUnmarshaller _instance = new PutObjectTaggingResponseUnmarshaller();        
 
         internal static PutObjectTaggingResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutPublicAccessBlockRequestMarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutPublicAccessBlockRequestMarshaller.cs
index 127899dd6cb0..42a6ba2ae967 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutPublicAccessBlockRequestMarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutPublicAccessBlockRequestMarshaller.cs
@@ -104,6 +104,8 @@ public IRequest Marshall(PutPublicAccessBlockRequest publicRequest)
                 string content = stringWriter.ToString();
                 request.Content = System.Text.Encoding.UTF8.GetBytes(content);
                 request.Headers["Content-Type"] = "application/xml";
+                if (publicRequest.IsSetContentMD5())
+                    request.Headers[Amazon.Util.HeaderKeys.ContentMD5Header] = publicRequest.ContentMD5;
                 ChecksumUtils.SetChecksumData(
                     request,
                     publicRequest.ChecksumAlgorithm,
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutPublicAccessBlockResponseUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutPublicAccessBlockResponseUnmarshaller.cs
index ea9de232d3e2..cc7e64a9caad 100644
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutPublicAccessBlockResponseUnmarshaller.cs
+++ b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/PutPublicAccessBlockResponseUnmarshaller.cs
@@ -36,7 +36,7 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Response Unmarshaller for PutPublicAccessBlock operation
     /// </summary>  
-    public partial class PutPublicAccessBlockResponseUnmarshaller : S3ReponseUnmarshaller
+    public class PutPublicAccessBlockResponseUnmarshaller : S3ReponseUnmarshaller
     {
         /// <summary>
         /// Unmarshaller the response from the service to the response class.
@@ -47,7 +47,6 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
         {
             PutPublicAccessBlockResponse response = new PutPublicAccessBlockResponse();
             
-            PostUnmarshallCustomization(context, response);
             return response;
         }        
   
@@ -74,8 +73,6 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             return base.ConstructS3Exception(context, errorResponse, innerException, statusCode);
         }
 
-        partial void PostUnmarshallCustomization(XmlUnmarshallerContext context, PutPublicAccessBlockResponse response);
-
         private static PutPublicAccessBlockResponseUnmarshaller _instance = new PutPublicAccessBlockResponseUnmarshaller();        
 
         internal static PutPublicAccessBlockResponseUnmarshaller GetInstance()
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/S3ObjectUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/S3ObjectUnmarshaller.cs
deleted file mode 100644
index 47da61b9ec41..000000000000
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/S3ObjectUnmarshaller.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Xml.Serialization;
-
-using Amazon.S3.Model;
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-using Amazon.Runtime.Internal.Transform;
-using Amazon.Runtime.Internal.Util;
-
-#pragma warning disable CS0612,CS0618
-namespace Amazon.S3.Model.Internal.MarshallTransformations
-{
-    /// <summary>
-    /// Response Unmarshaller for S3Object Object
-    /// </summary>  
-    public partial class S3ObjectUnmarshaller : IXmlUnmarshaller<S3Object, XmlUnmarshallerContext>
-    {
-        /// <summary>
-        /// Unmarshaller the response from the service to the response class.
-        /// </summary>  
-        /// <param name="context"></param>
-        /// <returns></returns>
-        public S3Object Unmarshall(XmlUnmarshallerContext context)
-        {
-            S3Object unmarshalledObject = new S3Object();
-            int originalDepth = context.CurrentDepth;
-            int targetDepth = originalDepth + 1;
-            
-            if (context.IsStartOfDocument) 
-               targetDepth += 2;
-            
-            while (context.Read())
-            {
-                if (context.IsStartElement || context.IsAttribute)
-                {
-                    if (context.TestExpression("ChecksumAlgorithm", targetDepth))
-                    {
-                        if (unmarshalledObject.ChecksumAlgorithm == null)
-                        {
-                            unmarshalledObject.ChecksumAlgorithm = new List<string>();
-                        }
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        unmarshalledObject.ChecksumAlgorithm.Add(unmarshaller.Unmarshall(context));
-                        continue;
-                    }
-                    if (context.TestExpression("ChecksumType", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        unmarshalledObject.ChecksumType = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("ETag", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        unmarshalledObject.ETag = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("Key", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        unmarshalledObject.Key = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("LastModified", targetDepth))
-                    {
-                        var unmarshaller = NullableDateTimeUnmarshaller.Instance;
-                        unmarshalledObject.LastModified = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("Owner", targetDepth))
-                    {
-                        var unmarshaller = OwnerUnmarshaller.Instance;
-                        unmarshalledObject.Owner = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("RestoreStatus", targetDepth))
-                    {
-                        var unmarshaller = RestoreStatusUnmarshaller.Instance;
-                        unmarshalledObject.RestoreStatus = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("Size", targetDepth))
-                    {
-                        var unmarshaller = NullableLongUnmarshaller.Instance;
-                        unmarshalledObject.Size = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("StorageClass", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        unmarshalledObject.StorageClass = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-
-                    XmlStructureUnmarshallCustomization(context, unmarshalledObject, targetDepth);
-                }
-                else if (context.IsEndElement && context.CurrentDepth < originalDepth)
-                {
-                    return unmarshalledObject;
-                }
-            }          
-            return unmarshalledObject;
-        }
-
-        partial void XmlStructureUnmarshallCustomization(XmlUnmarshallerContext context, S3Object unmarshalledObject, int targetDepth);
-
-        private static S3ObjectUnmarshaller _instance = new S3ObjectUnmarshaller();        
-
-        /// <summary>
-        /// Gets the singleton.
-        /// </summary>  
-        public static S3ObjectUnmarshaller Instance
-        {
-            get
-            {
-                return _instance;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/S3ObjectVersionUnmarshaller.cs b/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/S3ObjectVersionUnmarshaller.cs
deleted file mode 100644
index 5a29f929cb69..000000000000
--- a/sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/S3ObjectVersionUnmarshaller.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Xml.Serialization;
-
-using Amazon.S3.Model;
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-using Amazon.Runtime.Internal.Transform;
-using Amazon.Runtime.Internal.Util;
-
-#pragma warning disable CS0612,CS0618
-namespace Amazon.S3.Model.Internal.MarshallTransformations
-{
-    /// <summary>
-    /// Response Unmarshaller for S3ObjectVersion Object
-    /// </summary>  
-    public partial class S3ObjectVersionUnmarshaller : IXmlUnmarshaller<S3ObjectVersion, XmlUnmarshallerContext>
-    {
-        /// <summary>
-        /// Unmarshaller the response from the service to the response class.
-        /// </summary>  
-        /// <param name="context"></param>
-        /// <returns></returns>
-        public S3ObjectVersion Unmarshall(XmlUnmarshallerContext context)
-        {
-            S3ObjectVersion unmarshalledObject = new S3ObjectVersion();
-            int originalDepth = context.CurrentDepth;
-            int targetDepth = originalDepth + 1;
-            
-            if (context.IsStartOfDocument) 
-               targetDepth += 2;
-            
-            while (context.Read())
-            {
-                if (context.IsStartElement || context.IsAttribute)
-                {
-                    if (context.TestExpression("ChecksumAlgorithm", targetDepth))
-                    {
-                        if (unmarshalledObject.ChecksumAlgorithm == null)
-                        {
-                            unmarshalledObject.ChecksumAlgorithm = new List<string>();
-                        }
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        unmarshalledObject.ChecksumAlgorithm.Add(unmarshaller.Unmarshall(context));
-                        continue;
-                    }
-                    if (context.TestExpression("ChecksumType", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        unmarshalledObject.ChecksumType = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("ETag", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        unmarshalledObject.ETag = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("IsLatest", targetDepth))
-                    {
-                        var unmarshaller = NullableBoolUnmarshaller.Instance;
-                        unmarshalledObject.IsLatest = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("Key", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        unmarshalledObject.Key = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("LastModified", targetDepth))
-                    {
-                        var unmarshaller = NullableDateTimeUnmarshaller.Instance;
-                        unmarshalledObject.LastModified = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("Owner", targetDepth))
-                    {
-                        var unmarshaller = OwnerUnmarshaller.Instance;
-                        unmarshalledObject.Owner = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("RestoreStatus", targetDepth))
-                    {
-                        var unmarshaller = RestoreStatusUnmarshaller.Instance;
-                        unmarshalledObject.RestoreStatus = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("Size", targetDepth))
-                    {
-                        var unmarshaller = NullableLongUnmarshaller.Instance;
-                        unmarshalledObject.Size = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("StorageClass", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        unmarshalledObject.StorageClass = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-                    if (context.TestExpression("VersionId", targetDepth))
-                    {
-                        var unmarshaller = StringUnmarshaller.Instance;
-                        unmarshalledObject.VersionId = unmarshaller.Unmarshall(context);
-                        continue;
-                    }
-
-                    XmlStructureUnmarshallCustomization(context, unmarshalledObject, targetDepth);
-                }
-                else if (context.IsEndElement && context.CurrentDepth < originalDepth)
-                {
-                    return unmarshalledObject;
-                }
-            }          
-            return unmarshalledObject;
-        }
-
-        partial void XmlStructureUnmarshallCustomization(XmlUnmarshallerContext context, S3ObjectVersion unmarshalledObject, int targetDepth);
-
-        private static S3ObjectVersionUnmarshaller _instance = new S3ObjectVersionUnmarshaller();        
-
-        /// <summary>
-        /// Gets the singleton.
-        /// </summary>  
-        public static S3ObjectVersionUnmarshaller Instance
-        {
-            get
-            {
-                return _instance;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/ListVersionsResponse.cs b/sdk/src/Services/S3/Generated/Model/ListVersionsResponse.cs
deleted file mode 100644
index 0353079f1c26..000000000000
--- a/sdk/src/Services/S3/Generated/Model/ListVersionsResponse.cs
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Xml.Serialization;
-using System.Text;
-using System.IO;
-using System.Net;
-
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-
-#pragma warning disable CS0612,CS0618,CS1570
-namespace Amazon.S3.Model
-{
-    /// <summary>
-    /// This is the response object from the ListVersions operation.
-    /// </summary>
-    public partial class ListVersionsResponse : AmazonWebServiceResponse
-    {
-        private List<string> _commonPrefixes = AWSConfigs.InitializeCollections ? new List<string>() : null;
-        private string _delimiter;
-        private EncodingType _encoding;
-        private bool? _isTruncated;
-        private string _keyMarker;
-        private int? _maxKeys;
-        private string _name;
-        private string _nextKeyMarker;
-        private string _nextVersionIdMarker;
-        private string _prefix;
-        private RequestCharged _requestCharged;
-        private string _versionIdMarker;
-        private List<S3ObjectVersion> _versions = AWSConfigs.InitializeCollections ? new List<S3ObjectVersion>() : null;
-
-        /// <summary>
-        /// Gets and sets the property CommonPrefixes. 
-        /// <para>
-        /// All of the keys rolled up into a common prefix count as a single return when calculating
-        /// the number of returns.
-        /// </para>
-        /// <para />
-        /// Starting with version 4 of the SDK this property will default to null. If no data for this property is returned
-        /// from the service the property will also be null. This was changed to improve performance and allow the SDK and caller
-        /// to distinguish between a property not set or a property being empty to clear out a value. To retain the previous
-        /// SDK behavior set the AWSConfigs.InitializeCollections static property to true.
-        /// </summary>
-        public List<string> CommonPrefixes
-        {
-            get { return this._commonPrefixes; }
-            set { this._commonPrefixes = value; }
-        }
-
-        // Check to see if CommonPrefixes property is set
-        internal bool IsSetCommonPrefixes()
-        {
-            return this._commonPrefixes != null && (this._commonPrefixes.Count > 0 || !AWSConfigs.InitializeCollections); 
-        }
-
-        /// <summary>
-        /// Gets and sets the property Delimiter. 
-        /// <para>
-        /// The delimiter grouping the included keys. A delimiter is a character that you specify
-        /// to group keys. All keys that contain the same string between the prefix and the first
-        /// occurrence of the delimiter are grouped under a single result element in <c>CommonPrefixes</c>.
-        /// These groups are counted as one result against the <c>max-keys</c> limitation. These
-        /// keys are not returned elsewhere in the response.
-        /// </para>
-        /// </summary>
-        public string Delimiter
-        {
-            get { return this._delimiter; }
-            set { this._delimiter = value; }
-        }
-
-        // Check to see if Delimiter property is set
-        internal bool IsSetDelimiter()
-        {
-            return this._delimiter != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property Encoding. 
-        /// <para>
-        ///  Encoding type used by Amazon S3 to encode object key names in the XML response.
-        /// </para>
-        ///  
-        /// <para>
-        /// If you specify the <c>encoding-type</c> request parameter, Amazon S3 includes this
-        /// element in the response, and returns encoded key name values in the following response
-        /// elements:
-        /// </para>
-        ///  
-        /// <para>
-        ///  <c>KeyMarker, NextKeyMarker, Prefix, Key</c>, and <c>Delimiter</c>.
-        /// </para>
-        /// </summary>
-        public EncodingType Encoding
-        {
-            get { return this._encoding; }
-            set { this._encoding = value; }
-        }
-
-        // Check to see if Encoding property is set
-        internal bool IsSetEncoding()
-        {
-            return this._encoding != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property IsTruncated. 
-        /// <para>
-        /// A flag that indicates whether Amazon S3 returned all of the results that satisfied
-        /// the search criteria. If your results were truncated, you can make a follow-up paginated
-        /// request by using the <c>NextKeyMarker</c> and <c>NextVersionIdMarker</c> response
-        /// parameters as a starting place in another request to return the rest of the results.
-        /// </para>
-        /// </summary>
-        public bool? IsTruncated
-        {
-            get { return this._isTruncated; }
-            set { this._isTruncated = value; }
-        }
-
-        // Check to see if IsTruncated property is set
-        internal bool IsSetIsTruncated()
-        {
-            return this._isTruncated.HasValue; 
-        }
-
-        /// <summary>
-        /// Gets and sets the property KeyMarker. 
-        /// <para>
-        /// Marks the last key returned in a truncated response.
-        /// </para>
-        /// </summary>
-        public string KeyMarker
-        {
-            get { return this._keyMarker; }
-            set { this._keyMarker = value; }
-        }
-
-        // Check to see if KeyMarker property is set
-        internal bool IsSetKeyMarker()
-        {
-            return this._keyMarker != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property MaxKeys. 
-        /// <para>
-        /// Specifies the maximum number of objects to return.
-        /// </para>
-        /// </summary>
-        public int? MaxKeys
-        {
-            get { return this._maxKeys; }
-            set { this._maxKeys = value; }
-        }
-
-        // Check to see if MaxKeys property is set
-        internal bool IsSetMaxKeys()
-        {
-            return this._maxKeys.HasValue; 
-        }
-
-        /// <summary>
-        /// Gets and sets the property Name. 
-        /// <para>
-        /// The bucket name.
-        /// </para>
-        /// </summary>
-        public string Name
-        {
-            get { return this._name; }
-            set { this._name = value; }
-        }
-
-        // Check to see if Name property is set
-        internal bool IsSetName()
-        {
-            return this._name != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property NextKeyMarker. 
-        /// <para>
-        /// When the number of responses exceeds the value of <c>MaxKeys</c>, <c>NextKeyMarker</c>
-        /// specifies the first key not returned that satisfies the search criteria. Use this
-        /// value for the key-marker request parameter in a subsequent request.
-        /// </para>
-        /// </summary>
-        public string NextKeyMarker
-        {
-            get { return this._nextKeyMarker; }
-            set { this._nextKeyMarker = value; }
-        }
-
-        // Check to see if NextKeyMarker property is set
-        internal bool IsSetNextKeyMarker()
-        {
-            return this._nextKeyMarker != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property NextVersionIdMarker. 
-        /// <para>
-        /// When the number of responses exceeds the value of <c>MaxKeys</c>, <c>NextVersionIdMarker</c>
-        /// specifies the first object version not returned that satisfies the search criteria.
-        /// Use this value for the <c>version-id-marker</c> request parameter in a subsequent
-        /// request.
-        /// </para>
-        /// </summary>
-        public string NextVersionIdMarker
-        {
-            get { return this._nextVersionIdMarker; }
-            set { this._nextVersionIdMarker = value; }
-        }
-
-        // Check to see if NextVersionIdMarker property is set
-        internal bool IsSetNextVersionIdMarker()
-        {
-            return this._nextVersionIdMarker != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property Prefix. 
-        /// <para>
-        /// Selects objects that start with the value supplied by this parameter.
-        /// </para>
-        /// </summary>
-        public string Prefix
-        {
-            get { return this._prefix; }
-            set { this._prefix = value; }
-        }
-
-        // Check to see if Prefix property is set
-        internal bool IsSetPrefix()
-        {
-            return this._prefix != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property RequestCharged.
-        /// </summary>
-        public RequestCharged RequestCharged
-        {
-            get { return this._requestCharged; }
-            set { this._requestCharged = value; }
-        }
-
-        // Check to see if RequestCharged property is set
-        internal bool IsSetRequestCharged()
-        {
-            return this._requestCharged != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property VersionIdMarker. 
-        /// <para>
-        /// Marks the last version of the key returned in a truncated response.
-        /// </para>
-        /// </summary>
-        public string VersionIdMarker
-        {
-            get { return this._versionIdMarker; }
-            set { this._versionIdMarker = value; }
-        }
-
-        // Check to see if VersionIdMarker property is set
-        internal bool IsSetVersionIdMarker()
-        {
-            return this._versionIdMarker != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property Versions. 
-        /// <para>
-        /// Container for version information.
-        /// </para>
-        /// <para />
-        /// Starting with version 4 of the SDK this property will default to null. If no data for this property is returned
-        /// from the service the property will also be null. This was changed to improve performance and allow the SDK and caller
-        /// to distinguish between a property not set or a property being empty to clear out a value. To retain the previous
-        /// SDK behavior set the AWSConfigs.InitializeCollections static property to true.
-        /// </summary>
-        public List<S3ObjectVersion> Versions
-        {
-            get { return this._versions; }
-            set { this._versions = value; }
-        }
-
-        // Check to see if Versions property is set
-        internal bool IsSetVersions()
-        {
-            return this._versions != null && (this._versions.Count > 0 || !AWSConfigs.InitializeCollections); 
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/S3AccessControlList.cs b/sdk/src/Services/S3/Generated/Model/S3AccessControlList.cs
deleted file mode 100644
index cd49cdba9478..000000000000
--- a/sdk/src/Services/S3/Generated/Model/S3AccessControlList.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Xml.Serialization;
-using System.Text;
-using System.IO;
-using System.Net;
-
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-
-#pragma warning disable CS0612,CS0618,CS1570
-namespace Amazon.S3.Model
-{
-    /// <summary>
-    /// Contains the elements that set the ACL permissions for an object per grantee.
-    /// </summary>
-    public partial class S3AccessControlList
-    {
-        private List<S3Grant> _grants = AWSConfigs.InitializeCollections ? new List<S3Grant>() : null;
-        private Owner _owner;
-
-        /// <summary>
-        /// Gets and sets the property Grants. 
-        /// <para>
-        /// A list of grants.
-        /// </para>
-        /// <para />
-        /// Starting with version 4 of the SDK this property will default to null. If no data for this property is returned
-        /// from the service the property will also be null. This was changed to improve performance and allow the SDK and caller
-        /// to distinguish between a property not set or a property being empty to clear out a value. To retain the previous
-        /// SDK behavior set the AWSConfigs.InitializeCollections static property to true.
-        /// </summary>
-        public List<S3Grant> Grants
-        {
-            get { return this._grants; }
-            set { this._grants = value; }
-        }
-
-        // Check to see if Grants property is set
-        internal bool IsSetGrants()
-        {
-            return this._grants != null && (this._grants.Count > 0 || !AWSConfigs.InitializeCollections); 
-        }
-
-        /// <summary>
-        /// Gets and sets the property Owner. 
-        /// <para>
-        /// Container for the bucket owner's display name and ID.
-        /// </para>
-        /// </summary>
-        public Owner Owner
-        {
-            get { return this._owner; }
-            set { this._owner = value; }
-        }
-
-        // Check to see if Owner property is set
-        internal bool IsSetOwner()
-        {
-            return this._owner != null;
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/S3Object.cs b/sdk/src/Services/S3/Generated/Model/S3Object.cs
deleted file mode 100644
index e28a49903b95..000000000000
--- a/sdk/src/Services/S3/Generated/Model/S3Object.cs
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Xml.Serialization;
-using System.Text;
-using System.IO;
-using System.Net;
-
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-
-#pragma warning disable CS0612,CS0618,CS1570
-namespace Amazon.S3.Model
-{
-    /// <summary>
-    /// An object consists of data and its descriptive metadata.
-    /// </summary>
-    public partial class S3Object
-    {
-        private List<string> _checksumAlgorithm = AWSConfigs.InitializeCollections ? new List<string>() : null;
-        private ChecksumType _checksumType;
-        private string _eTag;
-        private string _key;
-        private DateTime? _lastModified;
-        private Owner _owner;
-        private RestoreStatus _restoreStatus;
-        private long? _size;
-        private S3StorageClass _storageClass;
-
-        /// <summary>
-        /// Gets and sets the property ChecksumAlgorithm. 
-        /// <para>
-        /// The algorithm that was used to create a checksum of the object.
-        /// </para>
-        /// <para />
-        /// Starting with version 4 of the SDK this property will default to null. If no data for this property is returned
-        /// from the service the property will also be null. This was changed to improve performance and allow the SDK and caller
-        /// to distinguish between a property not set or a property being empty to clear out a value. To retain the previous
-        /// SDK behavior set the AWSConfigs.InitializeCollections static property to true.
-        /// </summary>
-        public List<string> ChecksumAlgorithm
-        {
-            get { return this._checksumAlgorithm; }
-            set { this._checksumAlgorithm = value; }
-        }
-
-        // Check to see if ChecksumAlgorithm property is set
-        internal bool IsSetChecksumAlgorithm()
-        {
-            return this._checksumAlgorithm != null && (this._checksumAlgorithm.Count > 0 || !AWSConfigs.InitializeCollections); 
-        }
-
-        /// <summary>
-        /// Gets and sets the property ChecksumType. 
-        /// <para>
-        /// The checksum type that is used to calculate the object’s checksum value. For more
-        /// information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html">Checking
-        /// object integrity</a> in the <i>Amazon S3 User Guide</i>.
-        /// </para>
-        /// </summary>
-        public ChecksumType ChecksumType
-        {
-            get { return this._checksumType; }
-            set { this._checksumType = value; }
-        }
-
-        // Check to see if ChecksumType property is set
-        internal bool IsSetChecksumType()
-        {
-            return this._checksumType != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property ETag. 
-        /// <para>
-        /// The entity tag is a hash of the object. The ETag reflects changes only to the contents
-        /// of an object, not its metadata. The ETag may or may not be an MD5 digest of the object
-        /// data. Whether or not it is depends on how the object was created and how it is encrypted
-        /// as described below:
-        /// </para>
-        ///  <ul> <li> 
-        /// <para>
-        /// Objects created by the PUT Object, POST Object, or Copy operation, or through the
-        /// Amazon Web Services Management Console, and are encrypted by SSE-S3 or plaintext,
-        /// have ETags that are an MD5 digest of their object data.
-        /// </para>
-        ///  </li> <li> 
-        /// <para>
-        /// Objects created by the PUT Object, POST Object, or Copy operation, or through the
-        /// Amazon Web Services Management Console, and are encrypted by SSE-C or SSE-KMS, have
-        /// ETags that are not an MD5 digest of their object data.
-        /// </para>
-        ///  </li> <li> 
-        /// <para>
-        /// If an object is created by either the Multipart Upload or Part Copy operation, the
-        /// ETag is not an MD5 digest, regardless of the method of encryption. If an object is
-        /// larger than 16 MB, the Amazon Web Services Management Console will upload or copy
-        /// that object as a Multipart Upload, and therefore the ETag will not be an MD5 digest.
-        /// </para>
-        ///  </li> </ul> <note> 
-        /// <para>
-        ///  <b>Directory buckets</b> - MD5 is not supported by directory buckets.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public string ETag
-        {
-            get { return this._eTag; }
-            set { this._eTag = value; }
-        }
-
-        // Check to see if ETag property is set
-        internal bool IsSetETag()
-        {
-            return this._eTag != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property Key. 
-        /// <para>
-        /// The name that you assign to an object. You use the object key to retrieve the object.
-        /// </para>
-        /// </summary>
-        [AWSProperty(Min=1)]
-        public string Key
-        {
-            get { return this._key; }
-            set { this._key = value; }
-        }
-
-        // Check to see if Key property is set
-        internal bool IsSetKey()
-        {
-            return this._key != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property LastModified. 
-        /// <para>
-        /// Creation date of the object.
-        /// </para>
-        /// </summary>
-        public DateTime? LastModified
-        {
-            get { return this._lastModified; }
-            set { this._lastModified = value; }
-        }
-
-        // Check to see if LastModified property is set
-        internal bool IsSetLastModified()
-        {
-            return this._lastModified.HasValue; 
-        }
-
-        /// <summary>
-        /// Gets and sets the property Owner. 
-        /// <para>
-        /// The owner of the object
-        /// </para>
-        ///  <note> 
-        /// <para>
-        ///  <b>Directory buckets</b> - The bucket owner is returned as the object owner.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public Owner Owner
-        {
-            get { return this._owner; }
-            set { this._owner = value; }
-        }
-
-        // Check to see if Owner property is set
-        internal bool IsSetOwner()
-        {
-            return this._owner != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property RestoreStatus. 
-        /// <para>
-        /// Specifies the restoration status of an object. Objects in certain storage classes
-        /// must be restored before they can be retrieved. For more information about these storage
-        /// classes and how to work with archived objects, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/archived-objects.html">
-        /// Working with archived objects</a> in the <i>Amazon S3 User Guide</i>.
-        /// </para>
-        ///  <note> 
-        /// <para>
-        /// This functionality is not supported for directory buckets. Directory buckets only
-        /// support <c>EXPRESS_ONEZONE</c> (the S3 Express One Zone storage class) in Availability
-        /// Zones and <c>ONEZONE_IA</c> (the S3 One Zone-Infrequent Access storage class) in Dedicated
-        /// Local Zones.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public RestoreStatus RestoreStatus
-        {
-            get { return this._restoreStatus; }
-            set { this._restoreStatus = value; }
-        }
-
-        // Check to see if RestoreStatus property is set
-        internal bool IsSetRestoreStatus()
-        {
-            return this._restoreStatus != null;
-        }
-
-        /// <summary>
-        /// Gets and sets the property Size. 
-        /// <para>
-        /// Size in bytes of the object
-        /// </para>
-        /// </summary>
-        public long? Size
-        {
-            get { return this._size; }
-            set { this._size = value; }
-        }
-
-        // Check to see if Size property is set
-        internal bool IsSetSize()
-        {
-            return this._size.HasValue; 
-        }
-
-        /// <summary>
-        /// Gets and sets the property StorageClass. 
-        /// <para>
-        /// The class of storage used to store the object.
-        /// </para>
-        ///  <note> 
-        /// <para>
-        ///  <b>Directory buckets</b> - Directory buckets only support <c>EXPRESS_ONEZONE</c>
-        /// (the S3 Express One Zone storage class) in Availability Zones and <c>ONEZONE_IA</c>
-        /// (the S3 One Zone-Infrequent Access storage class) in Dedicated Local Zones.
-        /// </para>
-        ///  </note>
-        /// </summary>
-        public S3StorageClass StorageClass
-        {
-            get { return this._storageClass; }
-            set { this._storageClass = value; }
-        }
-
-        // Check to see if StorageClass property is set
-        internal bool IsSetStorageClass()
-        {
-            return this._storageClass != null;
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/sdk/src/Services/S3/Generated/Model/S3ObjectVersion.cs b/sdk/src/Services/S3/Generated/Model/S3ObjectVersion.cs
deleted file mode 100644
index f73e94d75eac..000000000000
--- a/sdk/src/Services/S3/Generated/Model/S3ObjectVersion.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- * 
- *  http://aws.amazon.com/apache2.0
- * 
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
- */
-using System;
-using System.Collections.Generic;
-using System.Xml.Serialization;
-using System.Text;
-using System.IO;
-using System.Net;
-
-using Amazon.Runtime;
-using Amazon.Runtime.Internal;
-
-#pragma warning disable CS0612,CS0618,CS1570
-namespace Amazon.S3.Model
-{
-    /// <summary>
-    /// The version of an object.
-    /// </summary>
-    public partial class S3ObjectVersion : S3Object
-    {
-        private bool? _isLatest;
-        private string _versionId;
-
-        /// <summary>
-        /// Gets and sets the property IsLatest. 
-        /// <para>
-        /// Specifies whether the object is (true) or is not (false) the latest version of an
-        /// object.
-        /// </para>
-        /// </summary>
-        public bool? IsLatest
-        {
-            get { return this._isLatest; }
-            set { this._isLatest = value; }
-        }
-
-        // Check to see if IsLatest property is set
-        internal bool IsSetIsLatest()
-        {
-            return this._isLatest.HasValue; 
-        }
-
-        /// <summary>
-        /// Gets and sets the property VersionId. 
-        /// <para>
-        /// Version ID of an object.
-        /// </para>
-        /// </summary>
-        public string VersionId
-        {
-            get { return this._versionId; }
-            set { this._versionId = value; }
-        }
-
-        // Check to see if VersionId property is set
-        internal bool IsSetVersionId()
-        {
-            return this._versionId != null;
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/sdk/test/UnitTests/Custom/ConstantClassTestBase.cs b/sdk/test/UnitTests/Custom/ConstantClassTestBase.cs
index e7d0b56802d5..aee6bfb14b4b 100644
--- a/sdk/test/UnitTests/Custom/ConstantClassTestBase.cs
+++ b/sdk/test/UnitTests/Custom/ConstantClassTestBase.cs
@@ -33,7 +33,7 @@ private IEnumerable<string> GetServiceModelEnumValues(string enumName)
         public void AssertConstantsMatch(IReflect constantClassType, string enumName)
         {
             var constantClassValues = new HashSet<string>(GetConstantClassValues(constantClassType));
-            var serviceModelEnumValues = string.IsNullOrEmpty(_serviceModelUnderTest.Customizations.GetOverrideShapeName(enumName)) ? GetServiceModelEnumValues(enumName) : GetServiceModelEnumValues(_serviceModelUnderTest.Customizations.GetOverrideShapeName(enumName));
+            var serviceModelEnumValues = new HashSet<string>(GetServiceModelEnumValues(enumName));
             Assert.IsTrue(constantClassValues.SetEquals(serviceModelEnumValues));
         }
     }