diff --git a/aws-cpp-sdk-AWSMigrationHub/nuget/aws-cpp-sdk-AWSMigrationHub.autopkg b/aws-cpp-sdk-AWSMigrationHub/nuget/aws-cpp-sdk-AWSMigrationHub.autopkg
index 3af75b145c1..9827d54c5a7 100644
--- a/aws-cpp-sdk-AWSMigrationHub/nuget/aws-cpp-sdk-AWSMigrationHub.autopkg
+++ b/aws-cpp-sdk-AWSMigrationHub/nuget/aws-cpp-sdk-AWSMigrationHub.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-MigrationHub;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170531.23;
+        version : 1.4.20170531.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Migration Hub);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-access-management/nuget/aws-cpp-sdk-access-management.autopkg b/aws-cpp-sdk-access-management/nuget/aws-cpp-sdk-access-management.autopkg
index 793656ad2b1..db76d31f376 100644
--- a/aws-cpp-sdk-access-management/nuget/aws-cpp-sdk-access-management.autopkg
+++ b/aws-cpp-sdk-access-management/nuget/aws-cpp-sdk-access-management.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-AccessManagement;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.23;
+        version : 1.4.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Access Management);
@@ -48,9 +48,9 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23,
-            AWSSDKCPP-CognitoIdentity/1.4.20140630.23,
-            AWSSDKCPP-IAM/1.4.20100508.23
+            AWSSDKCPP-Core/1.4.24,
+            AWSSDKCPP-CognitoIdentity/1.4.20140630.24,
+            AWSSDKCPP-IAM/1.4.20100508.24
        }
     }
 
diff --git a/aws-cpp-sdk-acm/nuget/aws-cpp-sdk-acm.autopkg b/aws-cpp-sdk-acm/nuget/aws-cpp-sdk-acm.autopkg
index f4d8012fc17..c75f7ce6ffb 100644
--- a/aws-cpp-sdk-acm/nuget/aws-cpp-sdk-acm.autopkg
+++ b/aws-cpp-sdk-acm/nuget/aws-cpp-sdk-acm.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-ACM;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20151208.23;
+        version : 1.4.20151208.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Certificate Manager);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-alexaforbusiness/nuget/aws-cpp-sdk-alexaforbusiness.autopkg b/aws-cpp-sdk-alexaforbusiness/nuget/aws-cpp-sdk-alexaforbusiness.autopkg
index 210e111a465..b1bb1073d61 100644
--- a/aws-cpp-sdk-alexaforbusiness/nuget/aws-cpp-sdk-alexaforbusiness.autopkg
+++ b/aws-cpp-sdk-alexaforbusiness/nuget/aws-cpp-sdk-alexaforbusiness.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-AlexaForBusiness;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20171109.23;
+        version : 1.4.20171109.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Alexa For Business);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-apigateway/nuget/aws-cpp-sdk-apigateway.autopkg b/aws-cpp-sdk-apigateway/nuget/aws-cpp-sdk-apigateway.autopkg
index 45f646eb719..1a105d6d7bb 100644
--- a/aws-cpp-sdk-apigateway/nuget/aws-cpp-sdk-apigateway.autopkg
+++ b/aws-cpp-sdk-apigateway/nuget/aws-cpp-sdk-apigateway.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-APIGateway;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20150709.23;
+        version : 1.4.20150709.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon API Gateway);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-application-autoscaling/nuget/aws-cpp-sdk-application-autoscaling.autopkg b/aws-cpp-sdk-application-autoscaling/nuget/aws-cpp-sdk-application-autoscaling.autopkg
index 34721998d16..eb360b42a7a 100644
--- a/aws-cpp-sdk-application-autoscaling/nuget/aws-cpp-sdk-application-autoscaling.autopkg
+++ b/aws-cpp-sdk-application-autoscaling/nuget/aws-cpp-sdk-application-autoscaling.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-ApplicationAutoScaling;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20160206.23;
+        version : 1.4.20160206.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Application Auto Scaling);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-appstream/nuget/aws-cpp-sdk-appstream.autopkg b/aws-cpp-sdk-appstream/nuget/aws-cpp-sdk-appstream.autopkg
index 12fb344310c..a3b558b1a47 100644
--- a/aws-cpp-sdk-appstream/nuget/aws-cpp-sdk-appstream.autopkg
+++ b/aws-cpp-sdk-appstream/nuget/aws-cpp-sdk-appstream.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-AppStream;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20161201.23;
+        version : 1.4.20161201.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon AppStream);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-appsync/nuget/aws-cpp-sdk-appsync.autopkg b/aws-cpp-sdk-appsync/nuget/aws-cpp-sdk-appsync.autopkg
index dfe2028ab5e..f4a1621dc84 100644
--- a/aws-cpp-sdk-appsync/nuget/aws-cpp-sdk-appsync.autopkg
+++ b/aws-cpp-sdk-appsync/nuget/aws-cpp-sdk-appsync.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-AppSync;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170725.23;
+        version : 1.4.20170725.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS AppSync);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-athena/nuget/aws-cpp-sdk-athena.autopkg b/aws-cpp-sdk-athena/nuget/aws-cpp-sdk-athena.autopkg
index 469501995b9..6ca51e24c46 100644
--- a/aws-cpp-sdk-athena/nuget/aws-cpp-sdk-athena.autopkg
+++ b/aws-cpp-sdk-athena/nuget/aws-cpp-sdk-athena.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Athena;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170518.23;
+        version : 1.4.20170518.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Athena);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-autoscaling-plans/nuget/aws-cpp-sdk-autoscaling-plans.autopkg b/aws-cpp-sdk-autoscaling-plans/nuget/aws-cpp-sdk-autoscaling-plans.autopkg
index a8da988237a..c649206a19e 100644
--- a/aws-cpp-sdk-autoscaling-plans/nuget/aws-cpp-sdk-autoscaling-plans.autopkg
+++ b/aws-cpp-sdk-autoscaling-plans/nuget/aws-cpp-sdk-autoscaling-plans.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-AutoScalingPlans;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20180106.23;
+        version : 1.4.20180106.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Auto Scaling Plans);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-autoscaling/nuget/aws-cpp-sdk-autoscaling.autopkg b/aws-cpp-sdk-autoscaling/nuget/aws-cpp-sdk-autoscaling.autopkg
index 3dd81857a9c..fdd107b950a 100644
--- a/aws-cpp-sdk-autoscaling/nuget/aws-cpp-sdk-autoscaling.autopkg
+++ b/aws-cpp-sdk-autoscaling/nuget/aws-cpp-sdk-autoscaling.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-AutoScaling;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20110101.23;
+        version : 1.4.20110101.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Auto Scaling);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-batch/nuget/aws-cpp-sdk-batch.autopkg b/aws-cpp-sdk-batch/nuget/aws-cpp-sdk-batch.autopkg
index df363b46954..3589897da16 100644
--- a/aws-cpp-sdk-batch/nuget/aws-cpp-sdk-batch.autopkg
+++ b/aws-cpp-sdk-batch/nuget/aws-cpp-sdk-batch.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Batch;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20160810.23;
+        version : 1.4.20160810.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Batch);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-budgets/nuget/aws-cpp-sdk-budgets.autopkg b/aws-cpp-sdk-budgets/nuget/aws-cpp-sdk-budgets.autopkg
index 4dfa4bb34ba..fbafb862193 100644
--- a/aws-cpp-sdk-budgets/nuget/aws-cpp-sdk-budgets.autopkg
+++ b/aws-cpp-sdk-budgets/nuget/aws-cpp-sdk-budgets.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Budgets;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20161020.23;
+        version : 1.4.20161020.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Budgets);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-ce/nuget/aws-cpp-sdk-ce.autopkg b/aws-cpp-sdk-ce/nuget/aws-cpp-sdk-ce.autopkg
index 4b2952609a8..a7add6815de 100644
--- a/aws-cpp-sdk-ce/nuget/aws-cpp-sdk-ce.autopkg
+++ b/aws-cpp-sdk-ce/nuget/aws-cpp-sdk-ce.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CostExplorer;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20171025.23;
+        version : 1.4.20171025.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Cost Explorer Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-cloud9/nuget/aws-cpp-sdk-cloud9.autopkg b/aws-cpp-sdk-cloud9/nuget/aws-cpp-sdk-cloud9.autopkg
index 390e00d121a..97993305002 100644
--- a/aws-cpp-sdk-cloud9/nuget/aws-cpp-sdk-cloud9.autopkg
+++ b/aws-cpp-sdk-cloud9/nuget/aws-cpp-sdk-cloud9.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Cloud9;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170923.23;
+        version : 1.4.20170923.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Cloud9);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-clouddirectory/nuget/aws-cpp-sdk-clouddirectory.autopkg b/aws-cpp-sdk-clouddirectory/nuget/aws-cpp-sdk-clouddirectory.autopkg
index a7b9c6daf86..7f0e4fbac87 100644
--- a/aws-cpp-sdk-clouddirectory/nuget/aws-cpp-sdk-clouddirectory.autopkg
+++ b/aws-cpp-sdk-clouddirectory/nuget/aws-cpp-sdk-clouddirectory.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CloudDirectory;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20160510.23;
+        version : 1.4.20160510.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon CloudDirectory);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-cloudformation/nuget/aws-cpp-sdk-cloudformation.autopkg b/aws-cpp-sdk-cloudformation/nuget/aws-cpp-sdk-cloudformation.autopkg
index 5978ec69ad6..31094ef5f0a 100644
--- a/aws-cpp-sdk-cloudformation/nuget/aws-cpp-sdk-cloudformation.autopkg
+++ b/aws-cpp-sdk-cloudformation/nuget/aws-cpp-sdk-cloudformation.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CloudFormation;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20100515.23;
+        version : 1.4.20100515.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS CloudFormation);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-cloudfront/nuget/aws-cpp-sdk-cloudfront.autopkg b/aws-cpp-sdk-cloudfront/nuget/aws-cpp-sdk-cloudfront.autopkg
index 69917d7b37a..655befb6812 100644
--- a/aws-cpp-sdk-cloudfront/nuget/aws-cpp-sdk-cloudfront.autopkg
+++ b/aws-cpp-sdk-cloudfront/nuget/aws-cpp-sdk-cloudfront.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CloudFront;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170325.23;
+        version : 1.4.20170325.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon CloudFront);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-cloudhsm/nuget/aws-cpp-sdk-cloudhsm.autopkg b/aws-cpp-sdk-cloudhsm/nuget/aws-cpp-sdk-cloudhsm.autopkg
index f8bdf3a0877..9780c968362 100644
--- a/aws-cpp-sdk-cloudhsm/nuget/aws-cpp-sdk-cloudhsm.autopkg
+++ b/aws-cpp-sdk-cloudhsm/nuget/aws-cpp-sdk-cloudhsm.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CloudHSM;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20140530.23;
+        version : 1.4.20140530.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon CloudHSM);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-cloudhsmv2/nuget/aws-cpp-sdk-cloudhsmv2.autopkg b/aws-cpp-sdk-cloudhsmv2/nuget/aws-cpp-sdk-cloudhsmv2.autopkg
index 9f2edccf24a..7c19fbdef4c 100644
--- a/aws-cpp-sdk-cloudhsmv2/nuget/aws-cpp-sdk-cloudhsmv2.autopkg
+++ b/aws-cpp-sdk-cloudhsmv2/nuget/aws-cpp-sdk-cloudhsmv2.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CloudHSMV2;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170428.23;
+        version : 1.4.20170428.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS CloudHSM V2);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-cloudsearch/nuget/aws-cpp-sdk-cloudsearch.autopkg b/aws-cpp-sdk-cloudsearch/nuget/aws-cpp-sdk-cloudsearch.autopkg
index 74699e492a7..92fb05c942c 100644
--- a/aws-cpp-sdk-cloudsearch/nuget/aws-cpp-sdk-cloudsearch.autopkg
+++ b/aws-cpp-sdk-cloudsearch/nuget/aws-cpp-sdk-cloudsearch.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CloudSearch;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20130101.23;
+        version : 1.4.20130101.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon CloudSearch);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-cloudsearchdomain/nuget/aws-cpp-sdk-cloudsearchdomain.autopkg b/aws-cpp-sdk-cloudsearchdomain/nuget/aws-cpp-sdk-cloudsearchdomain.autopkg
index bda5f5c4f97..8fde54ed515 100644
--- a/aws-cpp-sdk-cloudsearchdomain/nuget/aws-cpp-sdk-cloudsearchdomain.autopkg
+++ b/aws-cpp-sdk-cloudsearchdomain/nuget/aws-cpp-sdk-cloudsearchdomain.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CloudSearchDomain;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20130101.23;
+        version : 1.4.20130101.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon CloudSearch Domain);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-cloudtrail/nuget/aws-cpp-sdk-cloudtrail.autopkg b/aws-cpp-sdk-cloudtrail/nuget/aws-cpp-sdk-cloudtrail.autopkg
index 5828451dc52..7dacf54425b 100644
--- a/aws-cpp-sdk-cloudtrail/nuget/aws-cpp-sdk-cloudtrail.autopkg
+++ b/aws-cpp-sdk-cloudtrail/nuget/aws-cpp-sdk-cloudtrail.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CloudTrail;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20131101.23;
+        version : 1.4.20131101.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS CloudTrail);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-codebuild/nuget/aws-cpp-sdk-codebuild.autopkg b/aws-cpp-sdk-codebuild/nuget/aws-cpp-sdk-codebuild.autopkg
index 3b1765d5552..d5316d132dd 100644
--- a/aws-cpp-sdk-codebuild/nuget/aws-cpp-sdk-codebuild.autopkg
+++ b/aws-cpp-sdk-codebuild/nuget/aws-cpp-sdk-codebuild.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CodeBuild;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20161006.23;
+        version : 1.4.20161006.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS CodeBuild);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-codecommit/nuget/aws-cpp-sdk-codecommit.autopkg b/aws-cpp-sdk-codecommit/nuget/aws-cpp-sdk-codecommit.autopkg
index e4a603bf682..6595c76e166 100644
--- a/aws-cpp-sdk-codecommit/nuget/aws-cpp-sdk-codecommit.autopkg
+++ b/aws-cpp-sdk-codecommit/nuget/aws-cpp-sdk-codecommit.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CodeCommit;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20150413.23;
+        version : 1.4.20150413.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS CodeCommit);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-codedeploy/nuget/aws-cpp-sdk-codedeploy.autopkg b/aws-cpp-sdk-codedeploy/nuget/aws-cpp-sdk-codedeploy.autopkg
index 78bca358956..7bbbc009e5d 100644
--- a/aws-cpp-sdk-codedeploy/nuget/aws-cpp-sdk-codedeploy.autopkg
+++ b/aws-cpp-sdk-codedeploy/nuget/aws-cpp-sdk-codedeploy.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CodeDeploy;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20141006.23;
+        version : 1.4.20141006.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS CodeDeploy);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-codepipeline/nuget/aws-cpp-sdk-codepipeline.autopkg b/aws-cpp-sdk-codepipeline/nuget/aws-cpp-sdk-codepipeline.autopkg
index 28ccd994998..7e5ec0c746d 100644
--- a/aws-cpp-sdk-codepipeline/nuget/aws-cpp-sdk-codepipeline.autopkg
+++ b/aws-cpp-sdk-codepipeline/nuget/aws-cpp-sdk-codepipeline.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CodePipeline;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20150709.23;
+        version : 1.4.20150709.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS CodePipeline);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-codestar/nuget/aws-cpp-sdk-codestar.autopkg b/aws-cpp-sdk-codestar/nuget/aws-cpp-sdk-codestar.autopkg
index 0f86ed7791a..53f0dcbf6ec 100644
--- a/aws-cpp-sdk-codestar/nuget/aws-cpp-sdk-codestar.autopkg
+++ b/aws-cpp-sdk-codestar/nuget/aws-cpp-sdk-codestar.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CodeStar;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170419.23;
+        version : 1.4.20170419.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS CodeStar);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-cognito-identity/nuget/aws-cpp-sdk-cognito-identity.autopkg b/aws-cpp-sdk-cognito-identity/nuget/aws-cpp-sdk-cognito-identity.autopkg
index 9b579ca741b..42ce0f0affd 100644
--- a/aws-cpp-sdk-cognito-identity/nuget/aws-cpp-sdk-cognito-identity.autopkg
+++ b/aws-cpp-sdk-cognito-identity/nuget/aws-cpp-sdk-cognito-identity.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CognitoIdentity;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20140630.23;
+        version : 1.4.20140630.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Cognito Identity);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-cognito-idp/nuget/aws-cpp-sdk-cognito-idp.autopkg b/aws-cpp-sdk-cognito-idp/nuget/aws-cpp-sdk-cognito-idp.autopkg
index d3d8f1a5317..0eb0eb20b71 100644
--- a/aws-cpp-sdk-cognito-idp/nuget/aws-cpp-sdk-cognito-idp.autopkg
+++ b/aws-cpp-sdk-cognito-idp/nuget/aws-cpp-sdk-cognito-idp.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CognitoIdentityProvider;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20160418.23;
+        version : 1.4.20160418.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Cognito Identity Provider);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-cognito-sync/nuget/aws-cpp-sdk-cognito-sync.autopkg b/aws-cpp-sdk-cognito-sync/nuget/aws-cpp-sdk-cognito-sync.autopkg
index fdb0af5ad83..bb8912e4c65 100644
--- a/aws-cpp-sdk-cognito-sync/nuget/aws-cpp-sdk-cognito-sync.autopkg
+++ b/aws-cpp-sdk-cognito-sync/nuget/aws-cpp-sdk-cognito-sync.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CognitoSync;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20140630.23;
+        version : 1.4.20140630.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Cognito Sync);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-comprehend/nuget/aws-cpp-sdk-comprehend.autopkg b/aws-cpp-sdk-comprehend/nuget/aws-cpp-sdk-comprehend.autopkg
index 4b0b57a710f..2676162f71b 100644
--- a/aws-cpp-sdk-comprehend/nuget/aws-cpp-sdk-comprehend.autopkg
+++ b/aws-cpp-sdk-comprehend/nuget/aws-cpp-sdk-comprehend.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Comprehend;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20171127.23;
+        version : 1.4.20171127.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Comprehend);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-config/nuget/aws-cpp-sdk-config.autopkg b/aws-cpp-sdk-config/nuget/aws-cpp-sdk-config.autopkg
index 0132f849818..a71fa056698 100644
--- a/aws-cpp-sdk-config/nuget/aws-cpp-sdk-config.autopkg
+++ b/aws-cpp-sdk-config/nuget/aws-cpp-sdk-config.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-ConfigService;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20141112.23;
+        version : 1.4.20141112.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Config);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-core/include/aws/core/VersionConfig.h b/aws-cpp-sdk-core/include/aws/core/VersionConfig.h
index d4e2bbd00cb..055cd7b987f 100644
--- a/aws-cpp-sdk-core/include/aws/core/VersionConfig.h
+++ b/aws-cpp-sdk-core/include/aws/core/VersionConfig.h
@@ -13,4 +13,4 @@
   * permissions and limitations under the License.
   */
 
-#define AWS_SDK_VERSION_STRING "1.4.23"
+#define AWS_SDK_VERSION_STRING "1.4.24"
diff --git a/aws-cpp-sdk-core/nuget/aws-cpp-sdk-core.autopkg b/aws-cpp-sdk-core/nuget/aws-cpp-sdk-core.autopkg
index 066c370f0e6..034149dd56a 100644
--- a/aws-cpp-sdk-core/nuget/aws-cpp-sdk-core.autopkg
+++ b/aws-cpp-sdk-core/nuget/aws-cpp-sdk-core.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Core;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.23;
+        version : 1.4.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Core Runtime);
diff --git a/aws-cpp-sdk-cur/nuget/aws-cpp-sdk-cur.autopkg b/aws-cpp-sdk-cur/nuget/aws-cpp-sdk-cur.autopkg
index 02884df6b95..8c87e029fda 100644
--- a/aws-cpp-sdk-cur/nuget/aws-cpp-sdk-cur.autopkg
+++ b/aws-cpp-sdk-cur/nuget/aws-cpp-sdk-cur.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CostandUsageReportService;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170106.23;
+        version : 1.4.20170106.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Cost and Usage Report Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-datapipeline/nuget/aws-cpp-sdk-datapipeline.autopkg b/aws-cpp-sdk-datapipeline/nuget/aws-cpp-sdk-datapipeline.autopkg
index a84e56244e2..8f02f932d5c 100644
--- a/aws-cpp-sdk-datapipeline/nuget/aws-cpp-sdk-datapipeline.autopkg
+++ b/aws-cpp-sdk-datapipeline/nuget/aws-cpp-sdk-datapipeline.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-DataPipeline;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20121029.23;
+        version : 1.4.20121029.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Data Pipeline);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-dax/nuget/aws-cpp-sdk-dax.autopkg b/aws-cpp-sdk-dax/nuget/aws-cpp-sdk-dax.autopkg
index c87144d8ef7..7d423da6040 100644
--- a/aws-cpp-sdk-dax/nuget/aws-cpp-sdk-dax.autopkg
+++ b/aws-cpp-sdk-dax/nuget/aws-cpp-sdk-dax.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-DAX;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170419.23;
+        version : 1.4.20170419.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon DynamoDB Accelerator (DAX));
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-devicefarm/nuget/aws-cpp-sdk-devicefarm.autopkg b/aws-cpp-sdk-devicefarm/nuget/aws-cpp-sdk-devicefarm.autopkg
index e558de1123d..ddd17c190f3 100644
--- a/aws-cpp-sdk-devicefarm/nuget/aws-cpp-sdk-devicefarm.autopkg
+++ b/aws-cpp-sdk-devicefarm/nuget/aws-cpp-sdk-devicefarm.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-DeviceFarm;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20150623.23;
+        version : 1.4.20150623.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Device Farm);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-directconnect/nuget/aws-cpp-sdk-directconnect.autopkg b/aws-cpp-sdk-directconnect/nuget/aws-cpp-sdk-directconnect.autopkg
index 775f29995ba..edc2eb7f744 100644
--- a/aws-cpp-sdk-directconnect/nuget/aws-cpp-sdk-directconnect.autopkg
+++ b/aws-cpp-sdk-directconnect/nuget/aws-cpp-sdk-directconnect.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-DirectConnect;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20121025.23;
+        version : 1.4.20121025.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Direct Connect);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-discovery/nuget/aws-cpp-sdk-discovery.autopkg b/aws-cpp-sdk-discovery/nuget/aws-cpp-sdk-discovery.autopkg
index a61c4a1c2a4..730f45bff15 100644
--- a/aws-cpp-sdk-discovery/nuget/aws-cpp-sdk-discovery.autopkg
+++ b/aws-cpp-sdk-discovery/nuget/aws-cpp-sdk-discovery.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-ApplicationDiscoveryService;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20151101.23;
+        version : 1.4.20151101.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Application Discovery Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-dms/nuget/aws-cpp-sdk-dms.autopkg b/aws-cpp-sdk-dms/nuget/aws-cpp-sdk-dms.autopkg
index 1e4d38e5561..7425a2219e2 100644
--- a/aws-cpp-sdk-dms/nuget/aws-cpp-sdk-dms.autopkg
+++ b/aws-cpp-sdk-dms/nuget/aws-cpp-sdk-dms.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-DatabaseMigrationService;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20160101.23;
+        version : 1.4.20160101.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Database Migration Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-ds/nuget/aws-cpp-sdk-ds.autopkg b/aws-cpp-sdk-ds/nuget/aws-cpp-sdk-ds.autopkg
index 579f6c413fc..6caf41e9e1e 100644
--- a/aws-cpp-sdk-ds/nuget/aws-cpp-sdk-ds.autopkg
+++ b/aws-cpp-sdk-ds/nuget/aws-cpp-sdk-ds.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-DirectoryService;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20150416.23;
+        version : 1.4.20150416.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Directory Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-dynamodb/nuget/aws-cpp-sdk-dynamodb.autopkg b/aws-cpp-sdk-dynamodb/nuget/aws-cpp-sdk-dynamodb.autopkg
index edf3530dd79..4e4c122966d 100644
--- a/aws-cpp-sdk-dynamodb/nuget/aws-cpp-sdk-dynamodb.autopkg
+++ b/aws-cpp-sdk-dynamodb/nuget/aws-cpp-sdk-dynamodb.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-DynamoDB;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20120810.23;
+        version : 1.4.20120810.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon DynamoDB);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-dynamodbstreams/nuget/aws-cpp-sdk-dynamodbstreams.autopkg b/aws-cpp-sdk-dynamodbstreams/nuget/aws-cpp-sdk-dynamodbstreams.autopkg
index 35731234d86..019551f6de0 100644
--- a/aws-cpp-sdk-dynamodbstreams/nuget/aws-cpp-sdk-dynamodbstreams.autopkg
+++ b/aws-cpp-sdk-dynamodbstreams/nuget/aws-cpp-sdk-dynamodbstreams.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-DynamoDBStreams;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20120810.23;
+        version : 1.4.20120810.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon DynamoDB Streams);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-ec2/nuget/aws-cpp-sdk-ec2.autopkg b/aws-cpp-sdk-ec2/nuget/aws-cpp-sdk-ec2.autopkg
index e05e9482c86..489132c50db 100644
--- a/aws-cpp-sdk-ec2/nuget/aws-cpp-sdk-ec2.autopkg
+++ b/aws-cpp-sdk-ec2/nuget/aws-cpp-sdk-ec2.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-EC2;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20161115.23;
+        version : 1.4.20161115.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Elastic Compute Cloud);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-ecr/nuget/aws-cpp-sdk-ecr.autopkg b/aws-cpp-sdk-ecr/nuget/aws-cpp-sdk-ecr.autopkg
index e576fa0ac50..c54854ef390 100644
--- a/aws-cpp-sdk-ecr/nuget/aws-cpp-sdk-ecr.autopkg
+++ b/aws-cpp-sdk-ecr/nuget/aws-cpp-sdk-ecr.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-ECR;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20150921.23;
+        version : 1.4.20150921.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon EC2 Container Registry);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-ecs/nuget/aws-cpp-sdk-ecs.autopkg b/aws-cpp-sdk-ecs/nuget/aws-cpp-sdk-ecs.autopkg
index 26cd9164988..74c993f85bf 100644
--- a/aws-cpp-sdk-ecs/nuget/aws-cpp-sdk-ecs.autopkg
+++ b/aws-cpp-sdk-ecs/nuget/aws-cpp-sdk-ecs.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-ECS;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20141113.23;
+        version : 1.4.20141113.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon EC2 Container Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-elasticache/nuget/aws-cpp-sdk-elasticache.autopkg b/aws-cpp-sdk-elasticache/nuget/aws-cpp-sdk-elasticache.autopkg
index ff7cf84815c..645c8ca85f8 100644
--- a/aws-cpp-sdk-elasticache/nuget/aws-cpp-sdk-elasticache.autopkg
+++ b/aws-cpp-sdk-elasticache/nuget/aws-cpp-sdk-elasticache.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-ElastiCache;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20150202.23;
+        version : 1.4.20150202.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon ElastiCache);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-elasticbeanstalk/nuget/aws-cpp-sdk-elasticbeanstalk.autopkg b/aws-cpp-sdk-elasticbeanstalk/nuget/aws-cpp-sdk-elasticbeanstalk.autopkg
index 56e87009d1a..2787e7b2c60 100644
--- a/aws-cpp-sdk-elasticbeanstalk/nuget/aws-cpp-sdk-elasticbeanstalk.autopkg
+++ b/aws-cpp-sdk-elasticbeanstalk/nuget/aws-cpp-sdk-elasticbeanstalk.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-ElasticBeanstalk;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20101201.23;
+        version : 1.4.20101201.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Elastic Beanstalk);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-elasticfilesystem/nuget/aws-cpp-sdk-elasticfilesystem.autopkg b/aws-cpp-sdk-elasticfilesystem/nuget/aws-cpp-sdk-elasticfilesystem.autopkg
index 2012a4413fc..ca2b3d6a65d 100644
--- a/aws-cpp-sdk-elasticfilesystem/nuget/aws-cpp-sdk-elasticfilesystem.autopkg
+++ b/aws-cpp-sdk-elasticfilesystem/nuget/aws-cpp-sdk-elasticfilesystem.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-EFS;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20150201.23;
+        version : 1.4.20150201.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Elastic File System);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-elasticloadbalancing/nuget/aws-cpp-sdk-elasticloadbalancing.autopkg b/aws-cpp-sdk-elasticloadbalancing/nuget/aws-cpp-sdk-elasticloadbalancing.autopkg
index dbcadfd68a5..0c584a02b41 100644
--- a/aws-cpp-sdk-elasticloadbalancing/nuget/aws-cpp-sdk-elasticloadbalancing.autopkg
+++ b/aws-cpp-sdk-elasticloadbalancing/nuget/aws-cpp-sdk-elasticloadbalancing.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-ElasticLoadBalancing;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20120601.23;
+        version : 1.4.20120601.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Elastic Load Balancing);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-elasticloadbalancingv2/nuget/aws-cpp-sdk-elasticloadbalancingv2.autopkg b/aws-cpp-sdk-elasticloadbalancingv2/nuget/aws-cpp-sdk-elasticloadbalancingv2.autopkg
index 5a773f60e9d..1add3fc48ed 100644
--- a/aws-cpp-sdk-elasticloadbalancingv2/nuget/aws-cpp-sdk-elasticloadbalancingv2.autopkg
+++ b/aws-cpp-sdk-elasticloadbalancingv2/nuget/aws-cpp-sdk-elasticloadbalancingv2.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-ElasticLoadBalancingv2;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20151201.23;
+        version : 1.4.20151201.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Elastic Load Balancing);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-elasticmapreduce/nuget/aws-cpp-sdk-elasticmapreduce.autopkg b/aws-cpp-sdk-elasticmapreduce/nuget/aws-cpp-sdk-elasticmapreduce.autopkg
index f15e6ee4da8..4cdee3be97c 100644
--- a/aws-cpp-sdk-elasticmapreduce/nuget/aws-cpp-sdk-elasticmapreduce.autopkg
+++ b/aws-cpp-sdk-elasticmapreduce/nuget/aws-cpp-sdk-elasticmapreduce.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-EMR;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20090331.23;
+        version : 1.4.20090331.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Elastic MapReduce);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-elastictranscoder/nuget/aws-cpp-sdk-elastictranscoder.autopkg b/aws-cpp-sdk-elastictranscoder/nuget/aws-cpp-sdk-elastictranscoder.autopkg
index 9664124b869..dabc5fef9c0 100644
--- a/aws-cpp-sdk-elastictranscoder/nuget/aws-cpp-sdk-elastictranscoder.autopkg
+++ b/aws-cpp-sdk-elastictranscoder/nuget/aws-cpp-sdk-elastictranscoder.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-ElasticTranscoder;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20120925.23;
+        version : 1.4.20120925.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Elastic Transcoder);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-email/nuget/aws-cpp-sdk-email.autopkg b/aws-cpp-sdk-email/nuget/aws-cpp-sdk-email.autopkg
index 04e0386ad3b..eb9f35bdace 100644
--- a/aws-cpp-sdk-email/nuget/aws-cpp-sdk-email.autopkg
+++ b/aws-cpp-sdk-email/nuget/aws-cpp-sdk-email.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-SES;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20101201.23;
+        version : 1.4.20101201.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Simple Email Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-es/nuget/aws-cpp-sdk-es.autopkg b/aws-cpp-sdk-es/nuget/aws-cpp-sdk-es.autopkg
index 8c8c9a65dfc..f8311fb79dc 100644
--- a/aws-cpp-sdk-es/nuget/aws-cpp-sdk-es.autopkg
+++ b/aws-cpp-sdk-es/nuget/aws-cpp-sdk-es.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-ElasticsearchService;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20150101.23;
+        version : 1.4.20150101.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Elasticsearch Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-events/nuget/aws-cpp-sdk-events.autopkg b/aws-cpp-sdk-events/nuget/aws-cpp-sdk-events.autopkg
index 5015b4f38bb..132ce6aae4d 100644
--- a/aws-cpp-sdk-events/nuget/aws-cpp-sdk-events.autopkg
+++ b/aws-cpp-sdk-events/nuget/aws-cpp-sdk-events.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CloudWatchEvents;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20151007.23;
+        version : 1.4.20151007.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon CloudWatch Events);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-firehose/nuget/aws-cpp-sdk-firehose.autopkg b/aws-cpp-sdk-firehose/nuget/aws-cpp-sdk-firehose.autopkg
index 2f726366f1a..3e6d98e0757 100644
--- a/aws-cpp-sdk-firehose/nuget/aws-cpp-sdk-firehose.autopkg
+++ b/aws-cpp-sdk-firehose/nuget/aws-cpp-sdk-firehose.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Firehose;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20150804.23;
+        version : 1.4.20150804.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Kinesis Firehose);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-gamelift/nuget/aws-cpp-sdk-gamelift.autopkg b/aws-cpp-sdk-gamelift/nuget/aws-cpp-sdk-gamelift.autopkg
index 8676b9572a7..9a1aa0167ec 100644
--- a/aws-cpp-sdk-gamelift/nuget/aws-cpp-sdk-gamelift.autopkg
+++ b/aws-cpp-sdk-gamelift/nuget/aws-cpp-sdk-gamelift.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-GameLift;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20151001.23;
+        version : 1.4.20151001.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon GameLift);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-glacier/nuget/aws-cpp-sdk-glacier.autopkg b/aws-cpp-sdk-glacier/nuget/aws-cpp-sdk-glacier.autopkg
index f62fea2e91a..a7780422f52 100644
--- a/aws-cpp-sdk-glacier/nuget/aws-cpp-sdk-glacier.autopkg
+++ b/aws-cpp-sdk-glacier/nuget/aws-cpp-sdk-glacier.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Glacier;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20120601.23;
+        version : 1.4.20120601.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Glacier);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-glue/nuget/aws-cpp-sdk-glue.autopkg b/aws-cpp-sdk-glue/nuget/aws-cpp-sdk-glue.autopkg
index dabe2061c6b..fd182b2bab8 100644
--- a/aws-cpp-sdk-glue/nuget/aws-cpp-sdk-glue.autopkg
+++ b/aws-cpp-sdk-glue/nuget/aws-cpp-sdk-glue.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Glue;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170331.23;
+        version : 1.4.20170331.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Glue);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-greengrass/nuget/aws-cpp-sdk-greengrass.autopkg b/aws-cpp-sdk-greengrass/nuget/aws-cpp-sdk-greengrass.autopkg
index 9fc837bf75c..efd06583451 100644
--- a/aws-cpp-sdk-greengrass/nuget/aws-cpp-sdk-greengrass.autopkg
+++ b/aws-cpp-sdk-greengrass/nuget/aws-cpp-sdk-greengrass.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Greengrass;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170607.23;
+        version : 1.4.20170607.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Greengrass);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-guardduty/nuget/aws-cpp-sdk-guardduty.autopkg b/aws-cpp-sdk-guardduty/nuget/aws-cpp-sdk-guardduty.autopkg
index b583911fda1..7351da7efb7 100644
--- a/aws-cpp-sdk-guardduty/nuget/aws-cpp-sdk-guardduty.autopkg
+++ b/aws-cpp-sdk-guardduty/nuget/aws-cpp-sdk-guardduty.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-GuardDuty;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20171128.23;
+        version : 1.4.20171128.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon GuardDuty);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-health/nuget/aws-cpp-sdk-health.autopkg b/aws-cpp-sdk-health/nuget/aws-cpp-sdk-health.autopkg
index 2bf5de600ef..f1671646b37 100644
--- a/aws-cpp-sdk-health/nuget/aws-cpp-sdk-health.autopkg
+++ b/aws-cpp-sdk-health/nuget/aws-cpp-sdk-health.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Health;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20160804.23;
+        version : 1.4.20160804.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Health APIs and Notifications);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/IAMClient.h b/aws-cpp-sdk-iam/include/aws/iam/IAMClient.h
index 53450bb4d06..ac45e64d015 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/IAMClient.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/IAMClient.h
@@ -87,6 +87,7 @@
 #include <aws/iam/model/ResetServiceSpecificCredentialResult.h>
 #include <aws/iam/model/SimulateCustomPolicyResult.h>
 #include <aws/iam/model/SimulatePrincipalPolicyResult.h>
+#include <aws/iam/model/UpdateRoleResult.h>
 #include <aws/iam/model/UpdateRoleDescriptionResult.h>
 #include <aws/iam/model/UpdateSAMLProviderResult.h>
 #include <aws/iam/model/UploadSSHPublicKeyResult.h>
@@ -250,6 +251,7 @@ namespace Model
         class UpdateGroupRequest;
         class UpdateLoginProfileRequest;
         class UpdateOpenIDConnectProviderThumbprintRequest;
+        class UpdateRoleRequest;
         class UpdateRoleDescriptionRequest;
         class UpdateSAMLProviderRequest;
         class UpdateSSHPublicKeyRequest;
@@ -373,6 +375,7 @@ namespace Model
         typedef Aws::Utils::Outcome<Aws::NoResult, Aws::Client::AWSError<IAMErrors>> UpdateGroupOutcome;
         typedef Aws::Utils::Outcome<Aws::NoResult, Aws::Client::AWSError<IAMErrors>> UpdateLoginProfileOutcome;
         typedef Aws::Utils::Outcome<Aws::NoResult, Aws::Client::AWSError<IAMErrors>> UpdateOpenIDConnectProviderThumbprintOutcome;
+        typedef Aws::Utils::Outcome<UpdateRoleResult, Aws::Client::AWSError<IAMErrors>> UpdateRoleOutcome;
         typedef Aws::Utils::Outcome<UpdateRoleDescriptionResult, Aws::Client::AWSError<IAMErrors>> UpdateRoleDescriptionOutcome;
         typedef Aws::Utils::Outcome<UpdateSAMLProviderResult, Aws::Client::AWSError<IAMErrors>> UpdateSAMLProviderOutcome;
         typedef Aws::Utils::Outcome<Aws::NoResult, Aws::Client::AWSError<IAMErrors>> UpdateSSHPublicKeyOutcome;
@@ -496,6 +499,7 @@ namespace Model
         typedef std::future<UpdateGroupOutcome> UpdateGroupOutcomeCallable;
         typedef std::future<UpdateLoginProfileOutcome> UpdateLoginProfileOutcomeCallable;
         typedef std::future<UpdateOpenIDConnectProviderThumbprintOutcome> UpdateOpenIDConnectProviderThumbprintOutcomeCallable;
+        typedef std::future<UpdateRoleOutcome> UpdateRoleOutcomeCallable;
         typedef std::future<UpdateRoleDescriptionOutcome> UpdateRoleDescriptionOutcomeCallable;
         typedef std::future<UpdateSAMLProviderOutcome> UpdateSAMLProviderOutcomeCallable;
         typedef std::future<UpdateSSHPublicKeyOutcome> UpdateSSHPublicKeyOutcomeCallable;
@@ -622,6 +626,7 @@ namespace Model
     typedef std::function<void(const IAMClient*, const Model::UpdateGroupRequest&, const Model::UpdateGroupOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateGroupResponseReceivedHandler;
     typedef std::function<void(const IAMClient*, const Model::UpdateLoginProfileRequest&, const Model::UpdateLoginProfileOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateLoginProfileResponseReceivedHandler;
     typedef std::function<void(const IAMClient*, const Model::UpdateOpenIDConnectProviderThumbprintRequest&, const Model::UpdateOpenIDConnectProviderThumbprintOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateOpenIDConnectProviderThumbprintResponseReceivedHandler;
+    typedef std::function<void(const IAMClient*, const Model::UpdateRoleRequest&, const Model::UpdateRoleOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateRoleResponseReceivedHandler;
     typedef std::function<void(const IAMClient*, const Model::UpdateRoleDescriptionRequest&, const Model::UpdateRoleDescriptionOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateRoleDescriptionResponseReceivedHandler;
     typedef std::function<void(const IAMClient*, const Model::UpdateSAMLProviderRequest&, const Model::UpdateSAMLProviderOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateSAMLProviderResponseReceivedHandler;
     typedef std::function<void(const IAMClient*, const Model::UpdateSSHPublicKeyRequest&, const Model::UpdateSSHPublicKeyOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateSSHPublicKeyResponseReceivedHandler;
@@ -719,8 +724,9 @@ namespace Model
         /**
          * <p>Adds a new client ID (also known as audience) to the list of client IDs
          * already registered for the specified IAM OpenID Connect (OIDC) provider
-         * resource.</p> <p>This action is idempotent; it does not fail or return an error
-         * if you add an existing client ID to the provider.</p><p><h3>See Also:</h3>   <a
+         * resource.</p> <p>This operation is idempotent; it does not fail or return an
+         * error if you add an existing client ID to the provider.</p><p><h3>See Also:</h3>
+         * <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/AddClientIDToOpenIDConnectProvider">AWS
          * API Reference</a></p>
          */
@@ -729,8 +735,9 @@ namespace Model
         /**
          * <p>Adds a new client ID (also known as audience) to the list of client IDs
          * already registered for the specified IAM OpenID Connect (OIDC) provider
-         * resource.</p> <p>This action is idempotent; it does not fail or return an error
-         * if you add an existing client ID to the provider.</p><p><h3>See Also:</h3>   <a
+         * resource.</p> <p>This operation is idempotent; it does not fail or return an
+         * error if you add an existing client ID to the provider.</p><p><h3>See Also:</h3>
+         * <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/AddClientIDToOpenIDConnectProvider">AWS
          * API Reference</a></p>
          *
@@ -741,8 +748,9 @@ namespace Model
         /**
          * <p>Adds a new client ID (also known as audience) to the list of client IDs
          * already registered for the specified IAM OpenID Connect (OIDC) provider
-         * resource.</p> <p>This action is idempotent; it does not fail or return an error
-         * if you add an existing client ID to the provider.</p><p><h3>See Also:</h3>   <a
+         * resource.</p> <p>This operation is idempotent; it does not fail or return an
+         * error if you add an existing client ID to the provider.</p><p><h3>See Also:</h3>
+         * <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/AddClientIDToOpenIDConnectProvider">AWS
          * API Reference</a></p>
          *
@@ -752,7 +760,15 @@ namespace Model
 
         /**
          * <p>Adds the specified IAM role to the specified instance profile. An instance
-         * profile can contain only one role, and this limit cannot be increased.</p>
+         * profile can contain only one role, and this limit cannot be increased. You can
+         * remove the existing role and then add a different role to an instance profile.
+         * You must then wait for the change to appear across all of AWS because of <a
+         * href="https://en.wikipedia.org/wiki/Eventual_consistency">eventual
+         * consistency</a>. To force the change, you must <a
+         * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DisassociateIamInstanceProfile.html">disassociate
+         * the instance profile</a> and then <a
+         * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_AssociateIamInstanceProfile.html">associate
+         * the instance profile</a>, or you can stop your instance and then restart it.</p>
          * <note> <p>The caller of this API must be granted the <code>PassRole</code>
          * permission on the IAM role by a permission policy.</p> </note> <p>For more
          * information about roles, go to <a
@@ -767,7 +783,15 @@ namespace Model
 
         /**
          * <p>Adds the specified IAM role to the specified instance profile. An instance
-         * profile can contain only one role, and this limit cannot be increased.</p>
+         * profile can contain only one role, and this limit cannot be increased. You can
+         * remove the existing role and then add a different role to an instance profile.
+         * You must then wait for the change to appear across all of AWS because of <a
+         * href="https://en.wikipedia.org/wiki/Eventual_consistency">eventual
+         * consistency</a>. To force the change, you must <a
+         * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DisassociateIamInstanceProfile.html">disassociate
+         * the instance profile</a> and then <a
+         * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_AssociateIamInstanceProfile.html">associate
+         * the instance profile</a>, or you can stop your instance and then restart it.</p>
          * <note> <p>The caller of this API must be granted the <code>PassRole</code>
          * permission on the IAM role by a permission policy.</p> </note> <p>For more
          * information about roles, go to <a
@@ -784,7 +808,15 @@ namespace Model
 
         /**
          * <p>Adds the specified IAM role to the specified instance profile. An instance
-         * profile can contain only one role, and this limit cannot be increased.</p>
+         * profile can contain only one role, and this limit cannot be increased. You can
+         * remove the existing role and then add a different role to an instance profile.
+         * You must then wait for the change to appear across all of AWS because of <a
+         * href="https://en.wikipedia.org/wiki/Eventual_consistency">eventual
+         * consistency</a>. To force the change, you must <a
+         * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DisassociateIamInstanceProfile.html">disassociate
+         * the instance profile</a> and then <a
+         * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_AssociateIamInstanceProfile.html">associate
+         * the instance profile</a>, or you can stop your instance and then restart it.</p>
          * <note> <p>The caller of this API must be granted the <code>PassRole</code>
          * permission on the IAM role by a permission policy.</p> </note> <p>For more
          * information about roles, go to <a
@@ -966,10 +998,10 @@ namespace Model
         virtual void AttachUserPolicyAsync(const Model::AttachUserPolicyRequest& request, const AttachUserPolicyResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
 
         /**
-         * <p>Changes the password of the IAM user who is calling this action. The root
-         * account password is not affected by this action.</p> <p>To change the password
-         * for a different user, see <a>UpdateLoginProfile</a>. For more information about
-         * modifying passwords, see <a
+         * <p>Changes the password of the IAM user who is calling this operation. The AWS
+         * account root user password is not affected by this operation.</p> <p>To change
+         * the password for a different user, see <a>UpdateLoginProfile</a>. For more
+         * information about modifying passwords, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_ManagingLogins.html">Managing
          * Passwords</a> in the <i>IAM User Guide</i>.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ChangePassword">AWS
@@ -978,10 +1010,10 @@ namespace Model
         virtual Model::ChangePasswordOutcome ChangePassword(const Model::ChangePasswordRequest& request) const;
 
         /**
-         * <p>Changes the password of the IAM user who is calling this action. The root
-         * account password is not affected by this action.</p> <p>To change the password
-         * for a different user, see <a>UpdateLoginProfile</a>. For more information about
-         * modifying passwords, see <a
+         * <p>Changes the password of the IAM user who is calling this operation. The AWS
+         * account root user password is not affected by this operation.</p> <p>To change
+         * the password for a different user, see <a>UpdateLoginProfile</a>. For more
+         * information about modifying passwords, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_ManagingLogins.html">Managing
          * Passwords</a> in the <i>IAM User Guide</i>.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ChangePassword">AWS
@@ -992,10 +1024,10 @@ namespace Model
         virtual Model::ChangePasswordOutcomeCallable ChangePasswordCallable(const Model::ChangePasswordRequest& request) const;
 
         /**
-         * <p>Changes the password of the IAM user who is calling this action. The root
-         * account password is not affected by this action.</p> <p>To change the password
-         * for a different user, see <a>UpdateLoginProfile</a>. For more information about
-         * modifying passwords, see <a
+         * <p>Changes the password of the IAM user who is calling this operation. The AWS
+         * account root user password is not affected by this operation.</p> <p>To change
+         * the password for a different user, see <a>UpdateLoginProfile</a>. For more
+         * information about modifying passwords, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_ManagingLogins.html">Managing
          * Passwords</a> in the <i>IAM User Guide</i>.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ChangePassword">AWS
@@ -1009,10 +1041,11 @@ namespace Model
          * <p> Creates a new AWS secret access key and corresponding AWS access key ID for
          * the specified user. The default status for new keys is <code>Active</code>.</p>
          * <p>If you do not specify a user name, IAM determines the user name implicitly
-         * based on the AWS access key ID signing the request. Because this action works
-         * for access keys under the AWS account, you can use this action to manage root
-         * credentials even if the AWS account has no associated users.</p> <p> For
-         * information about limits on the number of keys you can create, see <a
+         * based on the AWS access key ID signing the request. Because this operation works
+         * for access keys under the AWS account, you can use this operation to manage AWS
+         * account root user credentials. This is true even if the AWS account has no
+         * associated users.</p> <p> For information about limits on the number of keys you
+         * can create, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/LimitationsOnEntities.html">Limitations
          * on IAM Entities</a> in the <i>IAM User Guide</i>.</p> <important> <p>To ensure
          * the security of your AWS account, the secret access key is accessible only
@@ -1029,10 +1062,11 @@ namespace Model
          * <p> Creates a new AWS secret access key and corresponding AWS access key ID for
          * the specified user. The default status for new keys is <code>Active</code>.</p>
          * <p>If you do not specify a user name, IAM determines the user name implicitly
-         * based on the AWS access key ID signing the request. Because this action works
-         * for access keys under the AWS account, you can use this action to manage root
-         * credentials even if the AWS account has no associated users.</p> <p> For
-         * information about limits on the number of keys you can create, see <a
+         * based on the AWS access key ID signing the request. Because this operation works
+         * for access keys under the AWS account, you can use this operation to manage AWS
+         * account root user credentials. This is true even if the AWS account has no
+         * associated users.</p> <p> For information about limits on the number of keys you
+         * can create, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/LimitationsOnEntities.html">Limitations
          * on IAM Entities</a> in the <i>IAM User Guide</i>.</p> <important> <p>To ensure
          * the security of your AWS account, the secret access key is accessible only
@@ -1051,10 +1085,11 @@ namespace Model
          * <p> Creates a new AWS secret access key and corresponding AWS access key ID for
          * the specified user. The default status for new keys is <code>Active</code>.</p>
          * <p>If you do not specify a user name, IAM determines the user name implicitly
-         * based on the AWS access key ID signing the request. Because this action works
-         * for access keys under the AWS account, you can use this action to manage root
-         * credentials even if the AWS account has no associated users.</p> <p> For
-         * information about limits on the number of keys you can create, see <a
+         * based on the AWS access key ID signing the request. Because this operation works
+         * for access keys under the AWS account, you can use this operation to manage AWS
+         * account root user credentials. This is true even if the AWS account has no
+         * associated users.</p> <p> For information about limits on the number of keys you
+         * can create, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/LimitationsOnEntities.html">Limitations
          * on IAM Entities</a> in the <i>IAM User Guide</i>.</p> <important> <p>To ensure
          * the security of your AWS account, the secret access key is accessible only
@@ -1224,16 +1259,17 @@ namespace Model
          * <p>Creates an IAM entity to describe an identity provider (IdP) that supports <a
          * href="http://openid.net/connect/">OpenID Connect (OIDC)</a>.</p> <p>The OIDC
          * provider that you create with this operation can be used as a principal in a
-         * role's trust policy to establish a trust relationship between AWS and the OIDC
-         * provider.</p> <p>When you create the IAM OIDC provider, you specify the URL of
-         * the OIDC identity provider (IdP) to trust, a list of client IDs (also known as
-         * audiences) that identify the application or applications that are allowed to
-         * authenticate using the OIDC provider, and a list of thumbprints of the server
-         * certificate(s) that the IdP uses. You get all of this information from the OIDC
-         * IdP that you want to use for access to AWS.</p> <note> <p>Because trust for the
-         * OIDC provider is ultimately derived from the IAM provider that this action
-         * creates, it is a best practice to limit access to the
-         * <a>CreateOpenIDConnectProvider</a> action to highly-privileged users.</p>
+         * role's trust policy. Such a policy establishes a trust relationship between AWS
+         * and the OIDC provider.</p> <p>When you create the IAM OIDC provider, you specify
+         * the following:</p> <ul> <li> <p>The URL of the OIDC identity provider (IdP) to
+         * trust</p> </li> <li> <p>A list of client IDs (also known as audiences) that
+         * identify the application or applications that are allowed to authenticate using
+         * the OIDC provider</p> </li> <li> <p>A list of thumbprints of the server
+         * certificate(s) that the IdP uses.</p> </li> </ul> <p>You get all of this
+         * information from the OIDC IdP that you want to use to access AWS.</p> <note>
+         * <p>Because trust for the OIDC provider is derived from the IAM provider that
+         * this operation creates, it is best to limit access to the
+         * <a>CreateOpenIDConnectProvider</a> operation to highly privileged users.</p>
          * </note><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/CreateOpenIDConnectProvider">AWS
          * API Reference</a></p>
@@ -1244,16 +1280,17 @@ namespace Model
          * <p>Creates an IAM entity to describe an identity provider (IdP) that supports <a
          * href="http://openid.net/connect/">OpenID Connect (OIDC)</a>.</p> <p>The OIDC
          * provider that you create with this operation can be used as a principal in a
-         * role's trust policy to establish a trust relationship between AWS and the OIDC
-         * provider.</p> <p>When you create the IAM OIDC provider, you specify the URL of
-         * the OIDC identity provider (IdP) to trust, a list of client IDs (also known as
-         * audiences) that identify the application or applications that are allowed to
-         * authenticate using the OIDC provider, and a list of thumbprints of the server
-         * certificate(s) that the IdP uses. You get all of this information from the OIDC
-         * IdP that you want to use for access to AWS.</p> <note> <p>Because trust for the
-         * OIDC provider is ultimately derived from the IAM provider that this action
-         * creates, it is a best practice to limit access to the
-         * <a>CreateOpenIDConnectProvider</a> action to highly-privileged users.</p>
+         * role's trust policy. Such a policy establishes a trust relationship between AWS
+         * and the OIDC provider.</p> <p>When you create the IAM OIDC provider, you specify
+         * the following:</p> <ul> <li> <p>The URL of the OIDC identity provider (IdP) to
+         * trust</p> </li> <li> <p>A list of client IDs (also known as audiences) that
+         * identify the application or applications that are allowed to authenticate using
+         * the OIDC provider</p> </li> <li> <p>A list of thumbprints of the server
+         * certificate(s) that the IdP uses.</p> </li> </ul> <p>You get all of this
+         * information from the OIDC IdP that you want to use to access AWS.</p> <note>
+         * <p>Because trust for the OIDC provider is derived from the IAM provider that
+         * this operation creates, it is best to limit access to the
+         * <a>CreateOpenIDConnectProvider</a> operation to highly privileged users.</p>
          * </note><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/CreateOpenIDConnectProvider">AWS
          * API Reference</a></p>
@@ -1266,16 +1303,17 @@ namespace Model
          * <p>Creates an IAM entity to describe an identity provider (IdP) that supports <a
          * href="http://openid.net/connect/">OpenID Connect (OIDC)</a>.</p> <p>The OIDC
          * provider that you create with this operation can be used as a principal in a
-         * role's trust policy to establish a trust relationship between AWS and the OIDC
-         * provider.</p> <p>When you create the IAM OIDC provider, you specify the URL of
-         * the OIDC identity provider (IdP) to trust, a list of client IDs (also known as
-         * audiences) that identify the application or applications that are allowed to
-         * authenticate using the OIDC provider, and a list of thumbprints of the server
-         * certificate(s) that the IdP uses. You get all of this information from the OIDC
-         * IdP that you want to use for access to AWS.</p> <note> <p>Because trust for the
-         * OIDC provider is ultimately derived from the IAM provider that this action
-         * creates, it is a best practice to limit access to the
-         * <a>CreateOpenIDConnectProvider</a> action to highly-privileged users.</p>
+         * role's trust policy. Such a policy establishes a trust relationship between AWS
+         * and the OIDC provider.</p> <p>When you create the IAM OIDC provider, you specify
+         * the following:</p> <ul> <li> <p>The URL of the OIDC identity provider (IdP) to
+         * trust</p> </li> <li> <p>A list of client IDs (also known as audiences) that
+         * identify the application or applications that are allowed to authenticate using
+         * the OIDC provider</p> </li> <li> <p>A list of thumbprints of the server
+         * certificate(s) that the IdP uses.</p> </li> </ul> <p>You get all of this
+         * information from the OIDC IdP that you want to use to access AWS.</p> <note>
+         * <p>Because trust for the OIDC provider is derived from the IAM provider that
+         * this operation creates, it is best to limit access to the
+         * <a>CreateOpenIDConnectProvider</a> operation to highly privileged users.</p>
          * </note><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/CreateOpenIDConnectProvider">AWS
          * API Reference</a></p>
@@ -1394,9 +1432,9 @@ namespace Model
         /**
          * <p>Creates a new role for your AWS account. For more information about roles, go
          * to <a
-         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html">Working
-         * with Roles</a>. For information about limitations on role names and the number
-         * of roles you can create, go to <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html">IAM
+         * Roles</a>. For information about limitations on role names and the number of
+         * roles you can create, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/LimitationsOnEntities.html">Limitations
          * on IAM Entities</a> in the <i>IAM User Guide</i>.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/CreateRole">AWS API
@@ -1407,9 +1445,9 @@ namespace Model
         /**
          * <p>Creates a new role for your AWS account. For more information about roles, go
          * to <a
-         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html">Working
-         * with Roles</a>. For information about limitations on role names and the number
-         * of roles you can create, go to <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html">IAM
+         * Roles</a>. For information about limitations on role names and the number of
+         * roles you can create, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/LimitationsOnEntities.html">Limitations
          * on IAM Entities</a> in the <i>IAM User Guide</i>.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/CreateRole">AWS API
@@ -1422,9 +1460,9 @@ namespace Model
         /**
          * <p>Creates a new role for your AWS account. For more information about roles, go
          * to <a
-         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html">Working
-         * with Roles</a>. For information about limitations on role names and the number
-         * of roles you can create, go to <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html">IAM
+         * Roles</a>. For information about limitations on role names and the number of
+         * roles you can create, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/LimitationsOnEntities.html">Limitations
          * on IAM Entities</a> in the <i>IAM User Guide</i>.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/CreateRole">AWS API
@@ -1437,12 +1475,12 @@ namespace Model
         /**
          * <p>Creates an IAM resource that describes an identity provider (IdP) that
          * supports SAML 2.0.</p> <p>The SAML provider resource that you create with this
-         * operation can be used as a principal in an IAM role's trust policy to enable
-         * federated users who sign-in using the SAML IdP to assume the role. You can
-         * create an IAM role that supports Web-based single sign-on (SSO) to the AWS
-         * Management Console or one that supports API access to AWS.</p> <p>When you
-         * create the SAML provider resource, you upload an a SAML metadata document that
-         * you get from your IdP and that includes the issuer's name, expiration
+         * operation can be used as a principal in an IAM role's trust policy. Such a
+         * policy can enable federated users who sign-in using the SAML IdP to assume the
+         * role. You can create an IAM role that supports Web-based single sign-on (SSO) to
+         * the AWS Management Console or one that supports API access to AWS.</p> <p>When
+         * you create the SAML provider resource, you upload a SAML metadata document that
+         * you get from your IdP. That document includes the issuer's name, expiration
          * information, and keys that can be used to validate the SAML authentication
          * response (assertions) that the IdP sends. You must generate the metadata
          * document using the identity management software that is used as your
@@ -1462,12 +1500,12 @@ namespace Model
         /**
          * <p>Creates an IAM resource that describes an identity provider (IdP) that
          * supports SAML 2.0.</p> <p>The SAML provider resource that you create with this
-         * operation can be used as a principal in an IAM role's trust policy to enable
-         * federated users who sign-in using the SAML IdP to assume the role. You can
-         * create an IAM role that supports Web-based single sign-on (SSO) to the AWS
-         * Management Console or one that supports API access to AWS.</p> <p>When you
-         * create the SAML provider resource, you upload an a SAML metadata document that
-         * you get from your IdP and that includes the issuer's name, expiration
+         * operation can be used as a principal in an IAM role's trust policy. Such a
+         * policy can enable federated users who sign-in using the SAML IdP to assume the
+         * role. You can create an IAM role that supports Web-based single sign-on (SSO) to
+         * the AWS Management Console or one that supports API access to AWS.</p> <p>When
+         * you create the SAML provider resource, you upload a SAML metadata document that
+         * you get from your IdP. That document includes the issuer's name, expiration
          * information, and keys that can be used to validate the SAML authentication
          * response (assertions) that the IdP sends. You must generate the metadata
          * document using the identity management software that is used as your
@@ -1489,12 +1527,12 @@ namespace Model
         /**
          * <p>Creates an IAM resource that describes an identity provider (IdP) that
          * supports SAML 2.0.</p> <p>The SAML provider resource that you create with this
-         * operation can be used as a principal in an IAM role's trust policy to enable
-         * federated users who sign-in using the SAML IdP to assume the role. You can
-         * create an IAM role that supports Web-based single sign-on (SSO) to the AWS
-         * Management Console or one that supports API access to AWS.</p> <p>When you
-         * create the SAML provider resource, you upload an a SAML metadata document that
-         * you get from your IdP and that includes the issuer's name, expiration
+         * operation can be used as a principal in an IAM role's trust policy. Such a
+         * policy can enable federated users who sign-in using the SAML IdP to assume the
+         * role. You can create an IAM role that supports Web-based single sign-on (SSO) to
+         * the AWS Management Console or one that supports API access to AWS.</p> <p>When
+         * you create the SAML provider resource, you upload a SAML metadata document that
+         * you get from your IdP. That document includes the issuer's name, expiration
          * information, and keys that can be used to validate the SAML authentication
          * response (assertions) that the IdP sends. You must generate the metadata
          * document using the identity management software that is used as your
@@ -1520,7 +1558,7 @@ namespace Model
          * role, which could put your AWS resources into an unknown state. Allowing the
          * service to control the role helps improve service stability and proper cleanup
          * when a service and its role are no longer needed.</p> <p>The name of the role is
-         * autogenerated by combining the string that you specify for the
+         * generated by combining the string that you specify for the
          * <code>AWSServiceName</code> parameter with the string that you specify for the
          * <code>CustomSuffix</code> parameter. The resulting name must be unique in your
          * account or the request fails.</p> <p>To attach a policy to this service-linked
@@ -1538,7 +1576,7 @@ namespace Model
          * role, which could put your AWS resources into an unknown state. Allowing the
          * service to control the role helps improve service stability and proper cleanup
          * when a service and its role are no longer needed.</p> <p>The name of the role is
-         * autogenerated by combining the string that you specify for the
+         * generated by combining the string that you specify for the
          * <code>AWSServiceName</code> parameter with the string that you specify for the
          * <code>CustomSuffix</code> parameter. The resulting name must be unique in your
          * account or the request fails.</p> <p>To attach a policy to this service-linked
@@ -1558,7 +1596,7 @@ namespace Model
          * role, which could put your AWS resources into an unknown state. Allowing the
          * service to control the role helps improve service stability and proper cleanup
          * when a service and its role are no longer needed.</p> <p>The name of the role is
-         * autogenerated by combining the string that you specify for the
+         * generated by combining the string that you specify for the
          * <code>AWSServiceName</code> parameter with the string that you specify for the
          * <code>CustomSuffix</code> parameter. The resulting name must be unique in your
          * account or the request fails.</p> <p>To attach a policy to this service-linked
@@ -1767,9 +1805,10 @@ namespace Model
         /**
          * <p>Deletes the access key pair associated with the specified IAM user.</p> <p>If
          * you do not specify a user name, IAM determines the user name implicitly based on
-         * the AWS access key ID signing the request. Because this action works for access
-         * keys under the AWS account, you can use this action to manage root credentials
-         * even if the AWS account has no associated users.</p><p><h3>See Also:</h3>   <a
+         * the AWS access key ID signing the request. Because this operation works for
+         * access keys under the AWS account, you can use this operation to manage AWS
+         * account root user credentials even if the AWS account has no associated
+         * users.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/DeleteAccessKey">AWS
          * API Reference</a></p>
          */
@@ -1778,9 +1817,10 @@ namespace Model
         /**
          * <p>Deletes the access key pair associated with the specified IAM user.</p> <p>If
          * you do not specify a user name, IAM determines the user name implicitly based on
-         * the AWS access key ID signing the request. Because this action works for access
-         * keys under the AWS account, you can use this action to manage root credentials
-         * even if the AWS account has no associated users.</p><p><h3>See Also:</h3>   <a
+         * the AWS access key ID signing the request. Because this operation works for
+         * access keys under the AWS account, you can use this operation to manage AWS
+         * account root user credentials even if the AWS account has no associated
+         * users.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/DeleteAccessKey">AWS
          * API Reference</a></p>
          *
@@ -1791,9 +1831,10 @@ namespace Model
         /**
          * <p>Deletes the access key pair associated with the specified IAM user.</p> <p>If
          * you do not specify a user name, IAM determines the user name implicitly based on
-         * the AWS access key ID signing the request. Because this action works for access
-         * keys under the AWS account, you can use this action to manage root credentials
-         * even if the AWS account has no associated users.</p><p><h3>See Also:</h3>   <a
+         * the AWS access key ID signing the request. Because this operation works for
+         * access keys under the AWS account, you can use this operation to manage AWS
+         * account root user credentials even if the AWS account has no associated
+         * users.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/DeleteAccessKey">AWS
          * API Reference</a></p>
          *
@@ -1939,11 +1980,11 @@ namespace Model
 
         /**
          * <p>Deletes the specified instance profile. The instance profile must not have an
-         * associated role.</p> <important> <p>Make sure you do not have any Amazon EC2
-         * instances running with the instance profile you are about to delete. Deleting a
-         * role or instance profile that is associated with a running instance will break
-         * any applications running on the instance.</p> </important> <p>For more
-         * information about instance profiles, go to <a
+         * associated role.</p> <important> <p>Make sure that you do not have any Amazon
+         * EC2 instances running with the instance profile you are about to delete.
+         * Deleting a role or instance profile that is associated with a running instance
+         * will break any applications running on the instance.</p> </important> <p>For
+         * more information about instance profiles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html">About
          * Instance Profiles</a>.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/DeleteInstanceProfile">AWS
@@ -1953,11 +1994,11 @@ namespace Model
 
         /**
          * <p>Deletes the specified instance profile. The instance profile must not have an
-         * associated role.</p> <important> <p>Make sure you do not have any Amazon EC2
-         * instances running with the instance profile you are about to delete. Deleting a
-         * role or instance profile that is associated with a running instance will break
-         * any applications running on the instance.</p> </important> <p>For more
-         * information about instance profiles, go to <a
+         * associated role.</p> <important> <p>Make sure that you do not have any Amazon
+         * EC2 instances running with the instance profile you are about to delete.
+         * Deleting a role or instance profile that is associated with a running instance
+         * will break any applications running on the instance.</p> </important> <p>For
+         * more information about instance profiles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html">About
          * Instance Profiles</a>.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/DeleteInstanceProfile">AWS
@@ -1969,11 +2010,11 @@ namespace Model
 
         /**
          * <p>Deletes the specified instance profile. The instance profile must not have an
-         * associated role.</p> <important> <p>Make sure you do not have any Amazon EC2
-         * instances running with the instance profile you are about to delete. Deleting a
-         * role or instance profile that is associated with a running instance will break
-         * any applications running on the instance.</p> </important> <p>For more
-         * information about instance profiles, go to <a
+         * associated role.</p> <important> <p>Make sure that you do not have any Amazon
+         * EC2 instances running with the instance profile you are about to delete.
+         * Deleting a role or instance profile that is associated with a running instance
+         * will break any applications running on the instance.</p> </important> <p>For
+         * more information about instance profiles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html">About
          * Instance Profiles</a>.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/DeleteInstanceProfile">AWS
@@ -2033,8 +2074,8 @@ namespace Model
          * <p>Deletes an OpenID Connect identity provider (IdP) resource object in IAM.</p>
          * <p>Deleting an IAM OIDC provider resource does not update any roles that
          * reference the provider as a principal in their trust policies. Any attempt to
-         * assume a role that references a deleted provider fails.</p> <p>This action is
-         * idempotent; it does not fail or return an error if you call the action for a
+         * assume a role that references a deleted provider fails.</p> <p>This operation is
+         * idempotent; it does not fail or return an error if you call the operation for a
          * provider that does not exist.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/DeleteOpenIDConnectProvider">AWS
          * API Reference</a></p>
@@ -2045,8 +2086,8 @@ namespace Model
          * <p>Deletes an OpenID Connect identity provider (IdP) resource object in IAM.</p>
          * <p>Deleting an IAM OIDC provider resource does not update any roles that
          * reference the provider as a principal in their trust policies. Any attempt to
-         * assume a role that references a deleted provider fails.</p> <p>This action is
-         * idempotent; it does not fail or return an error if you call the action for a
+         * assume a role that references a deleted provider fails.</p> <p>This operation is
+         * idempotent; it does not fail or return an error if you call the operation for a
          * provider that does not exist.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/DeleteOpenIDConnectProvider">AWS
          * API Reference</a></p>
@@ -2059,8 +2100,8 @@ namespace Model
          * <p>Deletes an OpenID Connect identity provider (IdP) resource object in IAM.</p>
          * <p>Deleting an IAM OIDC provider resource does not update any roles that
          * reference the provider as a principal in their trust policies. Any attempt to
-         * assume a role that references a deleted provider fails.</p> <p>This action is
-         * idempotent; it does not fail or return an error if you call the action for a
+         * assume a role that references a deleted provider fails.</p> <p>This operation is
+         * idempotent; it does not fail or return an error if you call the operation for a
          * provider that does not exist.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/DeleteOpenIDConnectProvider">AWS
          * API Reference</a></p>
@@ -2072,12 +2113,12 @@ namespace Model
         /**
          * <p>Deletes the specified managed policy.</p> <p>Before you can delete a managed
          * policy, you must first detach the policy from all users, groups, and roles that
-         * it is attached to, and you must delete all of the policy's versions. The
+         * it is attached to. In addition you must delete all the policy's versions. The
          * following steps describe the process for deleting a managed policy:</p> <ul>
          * <li> <p>Detach the policy from all users, groups, and roles that the policy is
          * attached to, using the <a>DetachUserPolicy</a>, <a>DetachGroupPolicy</a>, or
-         * <a>DetachRolePolicy</a> APIs. To list all the users, groups, and roles that a
-         * policy is attached to, use <a>ListEntitiesForPolicy</a>.</p> </li> <li>
+         * <a>DetachRolePolicy</a> API operations. To list all the users, groups, and roles
+         * that a policy is attached to, use <a>ListEntitiesForPolicy</a>.</p> </li> <li>
          * <p>Delete all versions of the policy using <a>DeletePolicyVersion</a>. To list
          * the policy's versions, use <a>ListPolicyVersions</a>. You cannot use
          * <a>DeletePolicyVersion</a> to delete the version that is marked as the default
@@ -2096,12 +2137,12 @@ namespace Model
         /**
          * <p>Deletes the specified managed policy.</p> <p>Before you can delete a managed
          * policy, you must first detach the policy from all users, groups, and roles that
-         * it is attached to, and you must delete all of the policy's versions. The
+         * it is attached to. In addition you must delete all the policy's versions. The
          * following steps describe the process for deleting a managed policy:</p> <ul>
          * <li> <p>Detach the policy from all users, groups, and roles that the policy is
          * attached to, using the <a>DetachUserPolicy</a>, <a>DetachGroupPolicy</a>, or
-         * <a>DetachRolePolicy</a> APIs. To list all the users, groups, and roles that a
-         * policy is attached to, use <a>ListEntitiesForPolicy</a>.</p> </li> <li>
+         * <a>DetachRolePolicy</a> API operations. To list all the users, groups, and roles
+         * that a policy is attached to, use <a>ListEntitiesForPolicy</a>.</p> </li> <li>
          * <p>Delete all versions of the policy using <a>DeletePolicyVersion</a>. To list
          * the policy's versions, use <a>ListPolicyVersions</a>. You cannot use
          * <a>DeletePolicyVersion</a> to delete the version that is marked as the default
@@ -2122,12 +2163,12 @@ namespace Model
         /**
          * <p>Deletes the specified managed policy.</p> <p>Before you can delete a managed
          * policy, you must first detach the policy from all users, groups, and roles that
-         * it is attached to, and you must delete all of the policy's versions. The
+         * it is attached to. In addition you must delete all the policy's versions. The
          * following steps describe the process for deleting a managed policy:</p> <ul>
          * <li> <p>Detach the policy from all users, groups, and roles that the policy is
          * attached to, using the <a>DetachUserPolicy</a>, <a>DetachGroupPolicy</a>, or
-         * <a>DetachRolePolicy</a> APIs. To list all the users, groups, and roles that a
-         * policy is attached to, use <a>ListEntitiesForPolicy</a>.</p> </li> <li>
+         * <a>DetachRolePolicy</a> API operations. To list all the users, groups, and roles
+         * that a policy is attached to, use <a>ListEntitiesForPolicy</a>.</p> </li> <li>
          * <p>Delete all versions of the policy using <a>DeletePolicyVersion</a>. To list
          * the policy's versions, use <a>ListPolicyVersions</a>. You cannot use
          * <a>DeletePolicyVersion</a> to delete the version that is marked as the default
@@ -2198,7 +2239,7 @@ namespace Model
          * <p>Deletes the specified role. The role must not have any policies attached. For
          * more information about roles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html">Working
-         * with Roles</a>.</p> <important> <p>Make sure you do not have any Amazon EC2
+         * with Roles</a>.</p> <important> <p>Make sure that you do not have any Amazon EC2
          * instances running with the role you are about to delete. Deleting a role or
          * instance profile that is associated with a running instance will break any
          * applications running on the instance.</p> </important><p><h3>See Also:</h3>   <a
@@ -2211,7 +2252,7 @@ namespace Model
          * <p>Deletes the specified role. The role must not have any policies attached. For
          * more information about roles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html">Working
-         * with Roles</a>.</p> <important> <p>Make sure you do not have any Amazon EC2
+         * with Roles</a>.</p> <important> <p>Make sure that you do not have any Amazon EC2
          * instances running with the role you are about to delete. Deleting a role or
          * instance profile that is associated with a running instance will break any
          * applications running on the instance.</p> </important><p><h3>See Also:</h3>   <a
@@ -2226,7 +2267,7 @@ namespace Model
          * <p>Deletes the specified role. The role must not have any policies attached. For
          * more information about roles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html">Working
-         * with Roles</a>.</p> <important> <p>Make sure you do not have any Amazon EC2
+         * with Roles</a>.</p> <important> <p>Make sure that you do not have any Amazon EC2
          * instances running with the role you are about to delete. Deleting a role or
          * instance profile that is associated with a running instance will break any
          * applications running on the instance.</p> </important><p><h3>See Also:</h3>   <a
@@ -2325,7 +2366,7 @@ namespace Model
 
         /**
          * <p>Deletes the specified SSH public key.</p> <p>The SSH public key deleted by
-         * this action is used only for authenticating the associated IAM user to an AWS
+         * this operation is used only for authenticating the associated IAM user to an AWS
          * CodeCommit repository. For more information about using SSH keys to authenticate
          * to an AWS CodeCommit repository, see <a
          * href="http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html">Set
@@ -2338,7 +2379,7 @@ namespace Model
 
         /**
          * <p>Deletes the specified SSH public key.</p> <p>The SSH public key deleted by
-         * this action is used only for authenticating the associated IAM user to an AWS
+         * this operation is used only for authenticating the associated IAM user to an AWS
          * CodeCommit repository. For more information about using SSH keys to authenticate
          * to an AWS CodeCommit repository, see <a
          * href="http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html">Set
@@ -2353,7 +2394,7 @@ namespace Model
 
         /**
          * <p>Deletes the specified SSH public key.</p> <p>The SSH public key deleted by
-         * this action is used only for authenticating the associated IAM user to an AWS
+         * this operation is used only for authenticating the associated IAM user to an AWS
          * CodeCommit repository. For more information about using SSH keys to authenticate
          * to an AWS CodeCommit repository, see <a
          * href="http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html">Set
@@ -2368,17 +2409,17 @@ namespace Model
 
         /**
          * <p>Deletes the specified server certificate.</p> <p>For more information about
-         * working with server certificates, including a list of AWS services that can use
-         * the server certificates that you manage with IAM, go to <a
+         * working with server certificates, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html">Working
-         * with Server Certificates</a> in the <i>IAM User Guide</i>.</p> <important> <p>
-         * If you are using a server certificate with Elastic Load Balancing, deleting the
-         * certificate could have implications for your application. If Elastic Load
-         * Balancing doesn't detect the deletion of bound certificates, it may continue to
-         * use the certificates. This could cause Elastic Load Balancing to stop accepting
-         * traffic. We recommend that you remove the reference to the certificate from
-         * Elastic Load Balancing before using this command to delete the certificate. For
-         * more information, go to <a
+         * with Server Certificates</a> in the <i>IAM User Guide</i>. This topic also
+         * includes a list of AWS services that can use the server certificates that you
+         * manage with IAM.</p> <important> <p> If you are using a server certificate with
+         * Elastic Load Balancing, deleting the certificate could have implications for
+         * your application. If Elastic Load Balancing doesn't detect the deletion of bound
+         * certificates, it may continue to use the certificates. This could cause Elastic
+         * Load Balancing to stop accepting traffic. We recommend that you remove the
+         * reference to the certificate from Elastic Load Balancing before using this
+         * command to delete the certificate. For more information, go to <a
          * href="http://docs.aws.amazon.com/ElasticLoadBalancing/latest/APIReference/API_DeleteLoadBalancerListeners.html">DeleteLoadBalancerListeners</a>
          * in the <i>Elastic Load Balancing API Reference</i>.</p> </important><p><h3>See
          * Also:</h3>   <a
@@ -2389,17 +2430,17 @@ namespace Model
 
         /**
          * <p>Deletes the specified server certificate.</p> <p>For more information about
-         * working with server certificates, including a list of AWS services that can use
-         * the server certificates that you manage with IAM, go to <a
+         * working with server certificates, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html">Working
-         * with Server Certificates</a> in the <i>IAM User Guide</i>.</p> <important> <p>
-         * If you are using a server certificate with Elastic Load Balancing, deleting the
-         * certificate could have implications for your application. If Elastic Load
-         * Balancing doesn't detect the deletion of bound certificates, it may continue to
-         * use the certificates. This could cause Elastic Load Balancing to stop accepting
-         * traffic. We recommend that you remove the reference to the certificate from
-         * Elastic Load Balancing before using this command to delete the certificate. For
-         * more information, go to <a
+         * with Server Certificates</a> in the <i>IAM User Guide</i>. This topic also
+         * includes a list of AWS services that can use the server certificates that you
+         * manage with IAM.</p> <important> <p> If you are using a server certificate with
+         * Elastic Load Balancing, deleting the certificate could have implications for
+         * your application. If Elastic Load Balancing doesn't detect the deletion of bound
+         * certificates, it may continue to use the certificates. This could cause Elastic
+         * Load Balancing to stop accepting traffic. We recommend that you remove the
+         * reference to the certificate from Elastic Load Balancing before using this
+         * command to delete the certificate. For more information, go to <a
          * href="http://docs.aws.amazon.com/ElasticLoadBalancing/latest/APIReference/API_DeleteLoadBalancerListeners.html">DeleteLoadBalancerListeners</a>
          * in the <i>Elastic Load Balancing API Reference</i>.</p> </important><p><h3>See
          * Also:</h3>   <a
@@ -2412,17 +2453,17 @@ namespace Model
 
         /**
          * <p>Deletes the specified server certificate.</p> <p>For more information about
-         * working with server certificates, including a list of AWS services that can use
-         * the server certificates that you manage with IAM, go to <a
+         * working with server certificates, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html">Working
-         * with Server Certificates</a> in the <i>IAM User Guide</i>.</p> <important> <p>
-         * If you are using a server certificate with Elastic Load Balancing, deleting the
-         * certificate could have implications for your application. If Elastic Load
-         * Balancing doesn't detect the deletion of bound certificates, it may continue to
-         * use the certificates. This could cause Elastic Load Balancing to stop accepting
-         * traffic. We recommend that you remove the reference to the certificate from
-         * Elastic Load Balancing before using this command to delete the certificate. For
-         * more information, go to <a
+         * with Server Certificates</a> in the <i>IAM User Guide</i>. This topic also
+         * includes a list of AWS services that can use the server certificates that you
+         * manage with IAM.</p> <important> <p> If you are using a server certificate with
+         * Elastic Load Balancing, deleting the certificate could have implications for
+         * your application. If Elastic Load Balancing doesn't detect the deletion of bound
+         * certificates, it may continue to use the certificates. This could cause Elastic
+         * Load Balancing to stop accepting traffic. We recommend that you remove the
+         * reference to the certificate from Elastic Load Balancing before using this
+         * command to delete the certificate. For more information, go to <a
          * href="http://docs.aws.amazon.com/ElasticLoadBalancing/latest/APIReference/API_DeleteLoadBalancerListeners.html">DeleteLoadBalancerListeners</a>
          * in the <i>Elastic Load Balancing API Reference</i>.</p> </important><p><h3>See
          * Also:</h3>   <a
@@ -2444,7 +2485,7 @@ namespace Model
          * submit a deletion request for a service-linked role whose linked service is
          * still accessing a resource, then the deletion task fails. If it fails, the
          * <a>GetServiceLinkedRoleDeletionStatus</a> API operation returns the reason for
-         * the failure, including the resources that must be deleted. To delete the
+         * the failure, usually including the resources that must be deleted. To delete the
          * service-linked role, you must first remove those resources from the linked
          * service and then submit the deletion request again. Resources are specific to
          * the service that is linked to the role. For more information about removing
@@ -2470,7 +2511,7 @@ namespace Model
          * submit a deletion request for a service-linked role whose linked service is
          * still accessing a resource, then the deletion task fails. If it fails, the
          * <a>GetServiceLinkedRoleDeletionStatus</a> API operation returns the reason for
-         * the failure, including the resources that must be deleted. To delete the
+         * the failure, usually including the resources that must be deleted. To delete the
          * service-linked role, you must first remove those resources from the linked
          * service and then submit the deletion request again. Resources are specific to
          * the service that is linked to the role. For more information about removing
@@ -2498,7 +2539,7 @@ namespace Model
          * submit a deletion request for a service-linked role whose linked service is
          * still accessing a resource, then the deletion task fails. If it fails, the
          * <a>GetServiceLinkedRoleDeletionStatus</a> API operation returns the reason for
-         * the failure, including the resources that must be deleted. To delete the
+         * the failure, usually including the resources that must be deleted. To delete the
          * service-linked role, you must first remove those resources from the linked
          * service and then submit the deletion request again. Resources are specific to
          * the service that is linked to the role. For more information about removing
@@ -2546,10 +2587,10 @@ namespace Model
         /**
          * <p>Deletes a signing certificate associated with the specified IAM user.</p>
          * <p>If you do not specify a user name, IAM determines the user name implicitly
-         * based on the AWS access key ID signing the request. Because this action works
-         * for access keys under the AWS account, you can use this action to manage root
-         * credentials even if the AWS account has no associated IAM users.</p><p><h3>See
-         * Also:</h3>   <a
+         * based on the AWS access key ID signing the request. Because this operation works
+         * for access keys under the AWS account, you can use this operation to manage AWS
+         * account root user credentials even if the AWS account has no associated IAM
+         * users.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/DeleteSigningCertificate">AWS
          * API Reference</a></p>
          */
@@ -2558,10 +2599,10 @@ namespace Model
         /**
          * <p>Deletes a signing certificate associated with the specified IAM user.</p>
          * <p>If you do not specify a user name, IAM determines the user name implicitly
-         * based on the AWS access key ID signing the request. Because this action works
-         * for access keys under the AWS account, you can use this action to manage root
-         * credentials even if the AWS account has no associated IAM users.</p><p><h3>See
-         * Also:</h3>   <a
+         * based on the AWS access key ID signing the request. Because this operation works
+         * for access keys under the AWS account, you can use this operation to manage AWS
+         * account root user credentials even if the AWS account has no associated IAM
+         * users.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/DeleteSigningCertificate">AWS
          * API Reference</a></p>
          *
@@ -2572,10 +2613,10 @@ namespace Model
         /**
          * <p>Deletes a signing certificate associated with the specified IAM user.</p>
          * <p>If you do not specify a user name, IAM determines the user name implicitly
-         * based on the AWS access key ID signing the request. Because this action works
-         * for access keys under the AWS account, you can use this action to manage root
-         * credentials even if the AWS account has no associated IAM users.</p><p><h3>See
-         * Also:</h3>   <a
+         * based on the AWS access key ID signing the request. Because this operation works
+         * for access keys under the AWS account, you can use this operation to manage AWS
+         * account root user credentials even if the AWS account has no associated IAM
+         * users.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/DeleteSigningCertificate">AWS
          * API Reference</a></p>
          *
@@ -2920,10 +2961,15 @@ namespace Model
          * <p>Retrieves information about all IAM users, groups, roles, and policies in
          * your AWS account, including their relationships to one another. Use this API to
          * obtain a snapshot of the configuration of IAM permissions (users, groups, roles,
-         * and policies) in your account.</p> <p>You can optionally filter the results
-         * using the <code>Filter</code> parameter. You can paginate the results using the
-         * <code>MaxItems</code> and <code>Marker</code> parameters.</p><p><h3>See
-         * Also:</h3>   <a
+         * and policies) in your account.</p> <note> <p>Policies returned by this API are
+         * URL-encoded compliant with <a href="https://tools.ietf.org/html/rfc3986">RFC
+         * 3986</a>. You can use a URL decoding method to convert the policy back to plain
+         * JSON text. For example, if you use Java, you can use the <code>decode</code>
+         * method of the <code>java.net.URLDecoder</code> utility class in the Java SDK.
+         * Other languages and SDKs provide similar functionality.</p> </note> <p>You can
+         * optionally filter the results using the <code>Filter</code> parameter. You can
+         * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
+         * parameters.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GetAccountAuthorizationDetails">AWS
          * API Reference</a></p>
          */
@@ -2933,10 +2979,15 @@ namespace Model
          * <p>Retrieves information about all IAM users, groups, roles, and policies in
          * your AWS account, including their relationships to one another. Use this API to
          * obtain a snapshot of the configuration of IAM permissions (users, groups, roles,
-         * and policies) in your account.</p> <p>You can optionally filter the results
-         * using the <code>Filter</code> parameter. You can paginate the results using the
-         * <code>MaxItems</code> and <code>Marker</code> parameters.</p><p><h3>See
-         * Also:</h3>   <a
+         * and policies) in your account.</p> <note> <p>Policies returned by this API are
+         * URL-encoded compliant with <a href="https://tools.ietf.org/html/rfc3986">RFC
+         * 3986</a>. You can use a URL decoding method to convert the policy back to plain
+         * JSON text. For example, if you use Java, you can use the <code>decode</code>
+         * method of the <code>java.net.URLDecoder</code> utility class in the Java SDK.
+         * Other languages and SDKs provide similar functionality.</p> </note> <p>You can
+         * optionally filter the results using the <code>Filter</code> parameter. You can
+         * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
+         * parameters.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GetAccountAuthorizationDetails">AWS
          * API Reference</a></p>
          *
@@ -2948,10 +2999,15 @@ namespace Model
          * <p>Retrieves information about all IAM users, groups, roles, and policies in
          * your AWS account, including their relationships to one another. Use this API to
          * obtain a snapshot of the configuration of IAM permissions (users, groups, roles,
-         * and policies) in your account.</p> <p>You can optionally filter the results
-         * using the <code>Filter</code> parameter. You can paginate the results using the
-         * <code>MaxItems</code> and <code>Marker</code> parameters.</p><p><h3>See
-         * Also:</h3>   <a
+         * and policies) in your account.</p> <note> <p>Policies returned by this API are
+         * URL-encoded compliant with <a href="https://tools.ietf.org/html/rfc3986">RFC
+         * 3986</a>. You can use a URL decoding method to convert the policy back to plain
+         * JSON text. For example, if you use Java, you can use the <code>decode</code>
+         * method of the <code>java.net.URLDecoder</code> utility class in the Java SDK.
+         * Other languages and SDKs provide similar functionality.</p> </note> <p>You can
+         * optionally filter the results using the <code>Filter</code> parameter. You can
+         * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
+         * parameters.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GetAccountAuthorizationDetails">AWS
          * API Reference</a></p>
          *
@@ -3033,12 +3089,12 @@ namespace Model
          * from policies associated with an IAM user, group, or role, use
          * <a>GetContextKeysForPrincipalPolicy</a>.</p> <p>Context keys are variables
          * maintained by AWS and its services that provide details about the context of an
-         * API query request, and can be evaluated by testing against a value specified in
-         * an IAM policy. Use GetContextKeysForCustomPolicy to understand what key names
-         * and values you must supply when you call <a>SimulateCustomPolicy</a>. Note that
-         * all parameters are shown in unencoded form here for clarity, but must be URL
-         * encoded to be included as a part of a real HTML request.</p><p><h3>See
-         * Also:</h3>   <a
+         * API query request. Context keys can be evaluated by testing against a value
+         * specified in an IAM policy. Use <code>GetContextKeysForCustomPolicy</code> to
+         * understand what key names and values you must supply when you call
+         * <a>SimulateCustomPolicy</a>. Note that all parameters are shown in unencoded
+         * form here for clarity but must be URL encoded to be included as a part of a real
+         * HTML request.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GetContextKeysForCustomPolicy">AWS
          * API Reference</a></p>
          */
@@ -3050,12 +3106,12 @@ namespace Model
          * from policies associated with an IAM user, group, or role, use
          * <a>GetContextKeysForPrincipalPolicy</a>.</p> <p>Context keys are variables
          * maintained by AWS and its services that provide details about the context of an
-         * API query request, and can be evaluated by testing against a value specified in
-         * an IAM policy. Use GetContextKeysForCustomPolicy to understand what key names
-         * and values you must supply when you call <a>SimulateCustomPolicy</a>. Note that
-         * all parameters are shown in unencoded form here for clarity, but must be URL
-         * encoded to be included as a part of a real HTML request.</p><p><h3>See
-         * Also:</h3>   <a
+         * API query request. Context keys can be evaluated by testing against a value
+         * specified in an IAM policy. Use <code>GetContextKeysForCustomPolicy</code> to
+         * understand what key names and values you must supply when you call
+         * <a>SimulateCustomPolicy</a>. Note that all parameters are shown in unencoded
+         * form here for clarity but must be URL encoded to be included as a part of a real
+         * HTML request.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GetContextKeysForCustomPolicy">AWS
          * API Reference</a></p>
          *
@@ -3069,12 +3125,12 @@ namespace Model
          * from policies associated with an IAM user, group, or role, use
          * <a>GetContextKeysForPrincipalPolicy</a>.</p> <p>Context keys are variables
          * maintained by AWS and its services that provide details about the context of an
-         * API query request, and can be evaluated by testing against a value specified in
-         * an IAM policy. Use GetContextKeysForCustomPolicy to understand what key names
-         * and values you must supply when you call <a>SimulateCustomPolicy</a>. Note that
-         * all parameters are shown in unencoded form here for clarity, but must be URL
-         * encoded to be included as a part of a real HTML request.</p><p><h3>See
-         * Also:</h3>   <a
+         * API query request. Context keys can be evaluated by testing against a value
+         * specified in an IAM policy. Use <code>GetContextKeysForCustomPolicy</code> to
+         * understand what key names and values you must supply when you call
+         * <a>SimulateCustomPolicy</a>. Note that all parameters are shown in unencoded
+         * form here for clarity but must be URL encoded to be included as a part of a real
+         * HTML request.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GetContextKeysForCustomPolicy">AWS
          * API Reference</a></p>
          *
@@ -3083,20 +3139,20 @@ namespace Model
         virtual void GetContextKeysForCustomPolicyAsync(const Model::GetContextKeysForCustomPolicyRequest& request, const GetContextKeysForCustomPolicyResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
 
         /**
-         * <p>Gets a list of all of the context keys referenced in all of the IAM policies
-         * attached to the specified IAM entity. The entity can be an IAM user, group, or
-         * role. If you specify a user, then the request also includes all of the policies
-         * attached to groups that the user is a member of.</p> <p>You can optionally
-         * include a list of one or more additional policies, specified as strings. If you
-         * want to include <i>only</i> a list of policies by string, use
+         * <p>Gets a list of all of the context keys referenced in all the IAM policies
+         * that are attached to the specified IAM entity. The entity can be an IAM user,
+         * group, or role. If you specify a user, then the request also includes all of the
+         * policies attached to groups that the user is a member of.</p> <p>You can
+         * optionally include a list of one or more additional policies, specified as
+         * strings. If you want to include <i>only</i> a list of policies by string, use
          * <a>GetContextKeysForCustomPolicy</a> instead.</p> <p> <b>Note:</b> This API
          * discloses information about the permissions granted to other users. If you do
          * not want users to see other user's permissions, then consider allowing them to
          * use <a>GetContextKeysForCustomPolicy</a> instead.</p> <p>Context keys are
          * variables maintained by AWS and its services that provide details about the
-         * context of an API query request, and can be evaluated by testing against a value
-         * in an IAM policy. Use <a>GetContextKeysForPrincipalPolicy</a> to understand what
-         * key names and values you must supply when you call
+         * context of an API query request. Context keys can be evaluated by testing
+         * against a value in an IAM policy. Use <a>GetContextKeysForPrincipalPolicy</a> to
+         * understand what key names and values you must supply when you call
          * <a>SimulatePrincipalPolicy</a>.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GetContextKeysForPrincipalPolicy">AWS
          * API Reference</a></p>
@@ -3104,20 +3160,20 @@ namespace Model
         virtual Model::GetContextKeysForPrincipalPolicyOutcome GetContextKeysForPrincipalPolicy(const Model::GetContextKeysForPrincipalPolicyRequest& request) const;
 
         /**
-         * <p>Gets a list of all of the context keys referenced in all of the IAM policies
-         * attached to the specified IAM entity. The entity can be an IAM user, group, or
-         * role. If you specify a user, then the request also includes all of the policies
-         * attached to groups that the user is a member of.</p> <p>You can optionally
-         * include a list of one or more additional policies, specified as strings. If you
-         * want to include <i>only</i> a list of policies by string, use
+         * <p>Gets a list of all of the context keys referenced in all the IAM policies
+         * that are attached to the specified IAM entity. The entity can be an IAM user,
+         * group, or role. If you specify a user, then the request also includes all of the
+         * policies attached to groups that the user is a member of.</p> <p>You can
+         * optionally include a list of one or more additional policies, specified as
+         * strings. If you want to include <i>only</i> a list of policies by string, use
          * <a>GetContextKeysForCustomPolicy</a> instead.</p> <p> <b>Note:</b> This API
          * discloses information about the permissions granted to other users. If you do
          * not want users to see other user's permissions, then consider allowing them to
          * use <a>GetContextKeysForCustomPolicy</a> instead.</p> <p>Context keys are
          * variables maintained by AWS and its services that provide details about the
-         * context of an API query request, and can be evaluated by testing against a value
-         * in an IAM policy. Use <a>GetContextKeysForPrincipalPolicy</a> to understand what
-         * key names and values you must supply when you call
+         * context of an API query request. Context keys can be evaluated by testing
+         * against a value in an IAM policy. Use <a>GetContextKeysForPrincipalPolicy</a> to
+         * understand what key names and values you must supply when you call
          * <a>SimulatePrincipalPolicy</a>.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GetContextKeysForPrincipalPolicy">AWS
          * API Reference</a></p>
@@ -3127,20 +3183,20 @@ namespace Model
         virtual Model::GetContextKeysForPrincipalPolicyOutcomeCallable GetContextKeysForPrincipalPolicyCallable(const Model::GetContextKeysForPrincipalPolicyRequest& request) const;
 
         /**
-         * <p>Gets a list of all of the context keys referenced in all of the IAM policies
-         * attached to the specified IAM entity. The entity can be an IAM user, group, or
-         * role. If you specify a user, then the request also includes all of the policies
-         * attached to groups that the user is a member of.</p> <p>You can optionally
-         * include a list of one or more additional policies, specified as strings. If you
-         * want to include <i>only</i> a list of policies by string, use
+         * <p>Gets a list of all of the context keys referenced in all the IAM policies
+         * that are attached to the specified IAM entity. The entity can be an IAM user,
+         * group, or role. If you specify a user, then the request also includes all of the
+         * policies attached to groups that the user is a member of.</p> <p>You can
+         * optionally include a list of one or more additional policies, specified as
+         * strings. If you want to include <i>only</i> a list of policies by string, use
          * <a>GetContextKeysForCustomPolicy</a> instead.</p> <p> <b>Note:</b> This API
          * discloses information about the permissions granted to other users. If you do
          * not want users to see other user's permissions, then consider allowing them to
          * use <a>GetContextKeysForCustomPolicy</a> instead.</p> <p>Context keys are
          * variables maintained by AWS and its services that provide details about the
-         * context of an API query request, and can be evaluated by testing against a value
-         * in an IAM policy. Use <a>GetContextKeysForPrincipalPolicy</a> to understand what
-         * key names and values you must supply when you call
+         * context of an API query request. Context keys can be evaluated by testing
+         * against a value in an IAM policy. Use <a>GetContextKeysForPrincipalPolicy</a> to
+         * understand what key names and values you must supply when you call
          * <a>SimulatePrincipalPolicy</a>.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GetContextKeysForPrincipalPolicy">AWS
          * API Reference</a></p>
@@ -3323,7 +3379,7 @@ namespace Model
 
         /**
          * <p>Retrieves the user name and password-creation date for the specified IAM
-         * user. If the user has not been assigned a password, the action returns a 404
+         * user. If the user has not been assigned a password, the operation returns a 404
          * (<code>NoSuchEntity</code>) error.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GetLoginProfile">AWS
          * API Reference</a></p>
@@ -3332,7 +3388,7 @@ namespace Model
 
         /**
          * <p>Retrieves the user name and password-creation date for the specified IAM
-         * user. If the user has not been assigned a password, the action returns a 404
+         * user. If the user has not been assigned a password, the operation returns a 404
          * (<code>NoSuchEntity</code>) error.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GetLoginProfile">AWS
          * API Reference</a></p>
@@ -3343,7 +3399,7 @@ namespace Model
 
         /**
          * <p>Retrieves the user name and password-creation date for the specified IAM
-         * user. If the user has not been assigned a password, the action returns a 404
+         * user. If the user has not been assigned a password, the operation returns a 404
          * (<code>NoSuchEntity</code>) error.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GetLoginProfile">AWS
          * API Reference</a></p>
@@ -3687,9 +3743,10 @@ namespace Model
 
         /**
          * <p>Retrieves the specified SSH public key, including metadata about the key.</p>
-         * <p>The SSH public key retrieved by this action is used only for authenticating
-         * the associated IAM user to an AWS CodeCommit repository. For more information
-         * about using SSH keys to authenticate to an AWS CodeCommit repository, see <a
+         * <p>The SSH public key retrieved by this operation is used only for
+         * authenticating the associated IAM user to an AWS CodeCommit repository. For more
+         * information about using SSH keys to authenticate to an AWS CodeCommit
+         * repository, see <a
          * href="http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html">Set
          * up AWS CodeCommit for SSH Connections</a> in the <i>AWS CodeCommit User
          * Guide</i>.</p><p><h3>See Also:</h3>   <a
@@ -3700,9 +3757,10 @@ namespace Model
 
         /**
          * <p>Retrieves the specified SSH public key, including metadata about the key.</p>
-         * <p>The SSH public key retrieved by this action is used only for authenticating
-         * the associated IAM user to an AWS CodeCommit repository. For more information
-         * about using SSH keys to authenticate to an AWS CodeCommit repository, see <a
+         * <p>The SSH public key retrieved by this operation is used only for
+         * authenticating the associated IAM user to an AWS CodeCommit repository. For more
+         * information about using SSH keys to authenticate to an AWS CodeCommit
+         * repository, see <a
          * href="http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html">Set
          * up AWS CodeCommit for SSH Connections</a> in the <i>AWS CodeCommit User
          * Guide</i>.</p><p><h3>See Also:</h3>   <a
@@ -3715,9 +3773,10 @@ namespace Model
 
         /**
          * <p>Retrieves the specified SSH public key, including metadata about the key.</p>
-         * <p>The SSH public key retrieved by this action is used only for authenticating
-         * the associated IAM user to an AWS CodeCommit repository. For more information
-         * about using SSH keys to authenticate to an AWS CodeCommit repository, see <a
+         * <p>The SSH public key retrieved by this operation is used only for
+         * authenticating the associated IAM user to an AWS CodeCommit repository. For more
+         * information about using SSH keys to authenticate to an AWS CodeCommit
+         * repository, see <a
          * href="http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html">Set
          * up AWS CodeCommit for SSH Connections</a> in the <i>AWS CodeCommit User
          * Guide</i>.</p><p><h3>See Also:</h3>   <a
@@ -3730,12 +3789,11 @@ namespace Model
 
         /**
          * <p>Retrieves information about the specified server certificate stored in
-         * IAM.</p> <p>For more information about working with server certificates,
-         * including a list of AWS services that can use the server certificates that you
-         * manage with IAM, go to <a
+         * IAM.</p> <p>For more information about working with server certificates, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html">Working
-         * with Server Certificates</a> in the <i>IAM User Guide</i>.</p><p><h3>See
-         * Also:</h3>   <a
+         * with Server Certificates</a> in the <i>IAM User Guide</i>. This topic includes a
+         * list of AWS services that can use the server certificates that you manage with
+         * IAM.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GetServerCertificate">AWS
          * API Reference</a></p>
          */
@@ -3743,12 +3801,11 @@ namespace Model
 
         /**
          * <p>Retrieves information about the specified server certificate stored in
-         * IAM.</p> <p>For more information about working with server certificates,
-         * including a list of AWS services that can use the server certificates that you
-         * manage with IAM, go to <a
+         * IAM.</p> <p>For more information about working with server certificates, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html">Working
-         * with Server Certificates</a> in the <i>IAM User Guide</i>.</p><p><h3>See
-         * Also:</h3>   <a
+         * with Server Certificates</a> in the <i>IAM User Guide</i>. This topic includes a
+         * list of AWS services that can use the server certificates that you manage with
+         * IAM.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GetServerCertificate">AWS
          * API Reference</a></p>
          *
@@ -3758,12 +3815,11 @@ namespace Model
 
         /**
          * <p>Retrieves information about the specified server certificate stored in
-         * IAM.</p> <p>For more information about working with server certificates,
-         * including a list of AWS services that can use the server certificates that you
-         * manage with IAM, go to <a
+         * IAM.</p> <p>For more information about working with server certificates, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html">Working
-         * with Server Certificates</a> in the <i>IAM User Guide</i>.</p><p><h3>See
-         * Also:</h3>   <a
+         * with Server Certificates</a> in the <i>IAM User Guide</i>. This topic includes a
+         * list of AWS services that can use the server certificates that you manage with
+         * IAM.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GetServerCertificate">AWS
          * API Reference</a></p>
          *
@@ -3777,7 +3833,8 @@ namespace Model
          * deletion, you can use the <code>DeletionTaskId</code> parameter in
          * <code>GetServiceLinkedRoleDeletionStatus</code> to check the status of the
          * deletion. If the deletion fails, this operation returns the reason that it
-         * failed.</p><p><h3>See Also:</h3>   <a
+         * failed, if that information is returned by the service.</p><p><h3>See Also:</h3>
+         * <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GetServiceLinkedRoleDeletionStatus">AWS
          * API Reference</a></p>
          */
@@ -3789,7 +3846,8 @@ namespace Model
          * deletion, you can use the <code>DeletionTaskId</code> parameter in
          * <code>GetServiceLinkedRoleDeletionStatus</code> to check the status of the
          * deletion. If the deletion fails, this operation returns the reason that it
-         * failed.</p><p><h3>See Also:</h3>   <a
+         * failed, if that information is returned by the service.</p><p><h3>See Also:</h3>
+         * <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GetServiceLinkedRoleDeletionStatus">AWS
          * API Reference</a></p>
          *
@@ -3803,7 +3861,8 @@ namespace Model
          * deletion, you can use the <code>DeletionTaskId</code> parameter in
          * <code>GetServiceLinkedRoleDeletionStatus</code> to check the status of the
          * deletion. If the deletion fails, this operation returns the reason that it
-         * failed.</p><p><h3>See Also:</h3>   <a
+         * failed, if that information is returned by the service.</p><p><h3>See Also:</h3>
+         * <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GetServiceLinkedRoleDeletionStatus">AWS
          * API Reference</a></p>
          *
@@ -3911,16 +3970,16 @@ namespace Model
 
         /**
          * <p>Returns information about the access key IDs associated with the specified
-         * IAM user. If there are none, the action returns an empty list.</p> <p>Although
-         * each user is limited to a small number of keys, you can still paginate the
-         * results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>
-         * <p>If the <code>UserName</code> field is not specified, the UserName is
-         * determined implicitly based on the AWS access key ID used to sign the request.
-         * Because this action works for access keys under the AWS account, you can use
-         * this action to manage root credentials even if the AWS account has no associated
-         * users.</p> <note> <p>To ensure the security of your AWS account, the secret
-         * access key is accessible only during key and user creation.</p>
-         * </note><p><h3>See Also:</h3>   <a
+         * IAM user. If there are none, the operation returns an empty list.</p>
+         * <p>Although each user is limited to a small number of keys, you can still
+         * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
+         * parameters.</p> <p>If the <code>UserName</code> field is not specified, the user
+         * name is determined implicitly based on the AWS access key ID used to sign the
+         * request. Because this operation works for access keys under the AWS account, you
+         * can use this operation to manage AWS account root user credentials even if the
+         * AWS account has no associated users.</p> <note> <p>To ensure the security of
+         * your AWS account, the secret access key is accessible only during key and user
+         * creation.</p> </note><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListAccessKeys">AWS
          * API Reference</a></p>
          */
@@ -3928,16 +3987,16 @@ namespace Model
 
         /**
          * <p>Returns information about the access key IDs associated with the specified
-         * IAM user. If there are none, the action returns an empty list.</p> <p>Although
-         * each user is limited to a small number of keys, you can still paginate the
-         * results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>
-         * <p>If the <code>UserName</code> field is not specified, the UserName is
-         * determined implicitly based on the AWS access key ID used to sign the request.
-         * Because this action works for access keys under the AWS account, you can use
-         * this action to manage root credentials even if the AWS account has no associated
-         * users.</p> <note> <p>To ensure the security of your AWS account, the secret
-         * access key is accessible only during key and user creation.</p>
-         * </note><p><h3>See Also:</h3>   <a
+         * IAM user. If there are none, the operation returns an empty list.</p>
+         * <p>Although each user is limited to a small number of keys, you can still
+         * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
+         * parameters.</p> <p>If the <code>UserName</code> field is not specified, the user
+         * name is determined implicitly based on the AWS access key ID used to sign the
+         * request. Because this operation works for access keys under the AWS account, you
+         * can use this operation to manage AWS account root user credentials even if the
+         * AWS account has no associated users.</p> <note> <p>To ensure the security of
+         * your AWS account, the secret access key is accessible only during key and user
+         * creation.</p> </note><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListAccessKeys">AWS
          * API Reference</a></p>
          *
@@ -3947,16 +4006,16 @@ namespace Model
 
         /**
          * <p>Returns information about the access key IDs associated with the specified
-         * IAM user. If there are none, the action returns an empty list.</p> <p>Although
-         * each user is limited to a small number of keys, you can still paginate the
-         * results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>
-         * <p>If the <code>UserName</code> field is not specified, the UserName is
-         * determined implicitly based on the AWS access key ID used to sign the request.
-         * Because this action works for access keys under the AWS account, you can use
-         * this action to manage root credentials even if the AWS account has no associated
-         * users.</p> <note> <p>To ensure the security of your AWS account, the secret
-         * access key is accessible only during key and user creation.</p>
-         * </note><p><h3>See Also:</h3>   <a
+         * IAM user. If there are none, the operation returns an empty list.</p>
+         * <p>Although each user is limited to a small number of keys, you can still
+         * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
+         * parameters.</p> <p>If the <code>UserName</code> field is not specified, the user
+         * name is determined implicitly based on the AWS access key ID used to sign the
+         * request. Because this operation works for access keys under the AWS account, you
+         * can use this operation to manage AWS account root user credentials even if the
+         * AWS account has no associated users.</p> <note> <p>To ensure the security of
+         * your AWS account, the secret access key is accessible only during key and user
+         * creation.</p> </note><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListAccessKeys">AWS
          * API Reference</a></p>
          *
@@ -4012,7 +4071,7 @@ namespace Model
          * parameters. You can use the <code>PathPrefix</code> parameter to limit the list
          * of policies to only those matching the specified path prefix. If there are no
          * policies attached to the specified group (or none that match the specified path
-         * prefix), the action returns an empty list.</p><p><h3>See Also:</h3>   <a
+         * prefix), the operation returns an empty list.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListAttachedGroupPolicies">AWS
          * API Reference</a></p>
          */
@@ -4029,7 +4088,7 @@ namespace Model
          * parameters. You can use the <code>PathPrefix</code> parameter to limit the list
          * of policies to only those matching the specified path prefix. If there are no
          * policies attached to the specified group (or none that match the specified path
-         * prefix), the action returns an empty list.</p><p><h3>See Also:</h3>   <a
+         * prefix), the operation returns an empty list.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListAttachedGroupPolicies">AWS
          * API Reference</a></p>
          *
@@ -4048,7 +4107,7 @@ namespace Model
          * parameters. You can use the <code>PathPrefix</code> parameter to limit the list
          * of policies to only those matching the specified path prefix. If there are no
          * policies attached to the specified group (or none that match the specified path
-         * prefix), the action returns an empty list.</p><p><h3>See Also:</h3>   <a
+         * prefix), the operation returns an empty list.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListAttachedGroupPolicies">AWS
          * API Reference</a></p>
          *
@@ -4067,7 +4126,7 @@ namespace Model
          * parameters. You can use the <code>PathPrefix</code> parameter to limit the list
          * of policies to only those matching the specified path prefix. If there are no
          * policies attached to the specified role (or none that match the specified path
-         * prefix), the action returns an empty list.</p><p><h3>See Also:</h3>   <a
+         * prefix), the operation returns an empty list.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListAttachedRolePolicies">AWS
          * API Reference</a></p>
          */
@@ -4084,7 +4143,7 @@ namespace Model
          * parameters. You can use the <code>PathPrefix</code> parameter to limit the list
          * of policies to only those matching the specified path prefix. If there are no
          * policies attached to the specified role (or none that match the specified path
-         * prefix), the action returns an empty list.</p><p><h3>See Also:</h3>   <a
+         * prefix), the operation returns an empty list.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListAttachedRolePolicies">AWS
          * API Reference</a></p>
          *
@@ -4103,7 +4162,7 @@ namespace Model
          * parameters. You can use the <code>PathPrefix</code> parameter to limit the list
          * of policies to only those matching the specified path prefix. If there are no
          * policies attached to the specified role (or none that match the specified path
-         * prefix), the action returns an empty list.</p><p><h3>See Also:</h3>   <a
+         * prefix), the operation returns an empty list.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListAttachedRolePolicies">AWS
          * API Reference</a></p>
          *
@@ -4122,7 +4181,7 @@ namespace Model
          * parameters. You can use the <code>PathPrefix</code> parameter to limit the list
          * of policies to only those matching the specified path prefix. If there are no
          * policies attached to the specified group (or none that match the specified path
-         * prefix), the action returns an empty list.</p><p><h3>See Also:</h3>   <a
+         * prefix), the operation returns an empty list.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListAttachedUserPolicies">AWS
          * API Reference</a></p>
          */
@@ -4139,7 +4198,7 @@ namespace Model
          * parameters. You can use the <code>PathPrefix</code> parameter to limit the list
          * of policies to only those matching the specified path prefix. If there are no
          * policies attached to the specified group (or none that match the specified path
-         * prefix), the action returns an empty list.</p><p><h3>See Also:</h3>   <a
+         * prefix), the operation returns an empty list.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListAttachedUserPolicies">AWS
          * API Reference</a></p>
          *
@@ -4158,7 +4217,7 @@ namespace Model
          * parameters. You can use the <code>PathPrefix</code> parameter to limit the list
          * of policies to only those matching the specified path prefix. If there are no
          * policies attached to the specified group (or none that match the specified path
-         * prefix), the action returns an empty list.</p><p><h3>See Also:</h3>   <a
+         * prefix), the operation returns an empty list.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListAttachedUserPolicies">AWS
          * API Reference</a></p>
          *
@@ -4218,7 +4277,7 @@ namespace Model
          * Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can
          * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
          * parameters. If there are no inline policies embedded with the specified group,
-         * the action returns an empty list.</p><p><h3>See Also:</h3>   <a
+         * the operation returns an empty list.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListGroupPolicies">AWS
          * API Reference</a></p>
          */
@@ -4233,7 +4292,7 @@ namespace Model
          * Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can
          * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
          * parameters. If there are no inline policies embedded with the specified group,
-         * the action returns an empty list.</p><p><h3>See Also:</h3>   <a
+         * the operation returns an empty list.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListGroupPolicies">AWS
          * API Reference</a></p>
          *
@@ -4250,7 +4309,7 @@ namespace Model
          * Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can
          * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
          * parameters. If there are no inline policies embedded with the specified group,
-         * the action returns an empty list.</p><p><h3>See Also:</h3>   <a
+         * the operation returns an empty list.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListGroupPolicies">AWS
          * API Reference</a></p>
          *
@@ -4322,7 +4381,7 @@ namespace Model
 
         /**
          * <p>Lists the instance profiles that have the specified path prefix. If there are
-         * none, the action returns an empty list. For more information about instance
+         * none, the operation returns an empty list. For more information about instance
          * profiles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html">About
          * Instance Profiles</a>.</p> <p>You can paginate the results using the
@@ -4335,7 +4394,7 @@ namespace Model
 
         /**
          * <p>Lists the instance profiles that have the specified path prefix. If there are
-         * none, the action returns an empty list. For more information about instance
+         * none, the operation returns an empty list. For more information about instance
          * profiles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html">About
          * Instance Profiles</a>.</p> <p>You can paginate the results using the
@@ -4350,7 +4409,7 @@ namespace Model
 
         /**
          * <p>Lists the instance profiles that have the specified path prefix. If there are
-         * none, the action returns an empty list. For more information about instance
+         * none, the operation returns an empty list. For more information about instance
          * profiles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html">About
          * Instance Profiles</a>.</p> <p>You can paginate the results using the
@@ -4365,7 +4424,7 @@ namespace Model
 
         /**
          * <p>Lists the instance profiles that have the specified associated IAM role. If
-         * there are none, the action returns an empty list. For more information about
+         * there are none, the operation returns an empty list. For more information about
          * instance profiles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html">About
          * Instance Profiles</a>.</p> <p>You can paginate the results using the
@@ -4378,7 +4437,7 @@ namespace Model
 
         /**
          * <p>Lists the instance profiles that have the specified associated IAM role. If
-         * there are none, the action returns an empty list. For more information about
+         * there are none, the operation returns an empty list. For more information about
          * instance profiles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html">About
          * Instance Profiles</a>.</p> <p>You can paginate the results using the
@@ -4393,7 +4452,7 @@ namespace Model
 
         /**
          * <p>Lists the instance profiles that have the specified associated IAM role. If
-         * there are none, the action returns an empty list. For more information about
+         * there are none, the operation returns an empty list. For more information about
          * instance profiles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html">About
          * Instance Profiles</a>.</p> <p>You can paginate the results using the
@@ -4408,11 +4467,11 @@ namespace Model
 
         /**
          * <p>Lists the MFA devices for an IAM user. If the request includes a IAM user
-         * name, then this action lists all the MFA devices associated with the specified
-         * user. If you do not specify a user name, IAM determines the user name implicitly
-         * based on the AWS access key ID signing the request for this API.</p> <p>You can
-         * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
-         * parameters.</p><p><h3>See Also:</h3>   <a
+         * name, then this operation lists all the MFA devices associated with the
+         * specified user. If you do not specify a user name, IAM determines the user name
+         * implicitly based on the AWS access key ID signing the request for this API.</p>
+         * <p>You can paginate the results using the <code>MaxItems</code> and
+         * <code>Marker</code> parameters.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListMFADevices">AWS
          * API Reference</a></p>
          */
@@ -4420,11 +4479,11 @@ namespace Model
 
         /**
          * <p>Lists the MFA devices for an IAM user. If the request includes a IAM user
-         * name, then this action lists all the MFA devices associated with the specified
-         * user. If you do not specify a user name, IAM determines the user name implicitly
-         * based on the AWS access key ID signing the request for this API.</p> <p>You can
-         * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
-         * parameters.</p><p><h3>See Also:</h3>   <a
+         * name, then this operation lists all the MFA devices associated with the
+         * specified user. If you do not specify a user name, IAM determines the user name
+         * implicitly based on the AWS access key ID signing the request for this API.</p>
+         * <p>You can paginate the results using the <code>MaxItems</code> and
+         * <code>Marker</code> parameters.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListMFADevices">AWS
          * API Reference</a></p>
          *
@@ -4434,11 +4493,11 @@ namespace Model
 
         /**
          * <p>Lists the MFA devices for an IAM user. If the request includes a IAM user
-         * name, then this action lists all the MFA devices associated with the specified
-         * user. If you do not specify a user name, IAM determines the user name implicitly
-         * based on the AWS access key ID signing the request for this API.</p> <p>You can
-         * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
-         * parameters.</p><p><h3>See Also:</h3>   <a
+         * name, then this operation lists all the MFA devices associated with the
+         * specified user. If you do not specify a user name, IAM determines the user name
+         * implicitly based on the AWS access key ID signing the request for this API.</p>
+         * <p>You can paginate the results using the <code>MaxItems</code> and
+         * <code>Marker</code> parameters.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListMFADevices">AWS
          * API Reference</a></p>
          *
@@ -4584,7 +4643,7 @@ namespace Model
          * Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can
          * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
          * parameters. If there are no inline policies embedded with the specified role,
-         * the action returns an empty list.</p><p><h3>See Also:</h3>   <a
+         * the operation returns an empty list.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListRolePolicies">AWS
          * API Reference</a></p>
          */
@@ -4599,7 +4658,7 @@ namespace Model
          * Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can
          * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
          * parameters. If there are no inline policies embedded with the specified role,
-         * the action returns an empty list.</p><p><h3>See Also:</h3>   <a
+         * the operation returns an empty list.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListRolePolicies">AWS
          * API Reference</a></p>
          *
@@ -4616,7 +4675,7 @@ namespace Model
          * Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can
          * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
          * parameters. If there are no inline policies embedded with the specified role,
-         * the action returns an empty list.</p><p><h3>See Also:</h3>   <a
+         * the operation returns an empty list.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListRolePolicies">AWS
          * API Reference</a></p>
          *
@@ -4626,7 +4685,7 @@ namespace Model
 
         /**
          * <p>Lists the IAM roles that have the specified path prefix. If there are none,
-         * the action returns an empty list. For more information about roles, go to <a
+         * the operation returns an empty list. For more information about roles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html">Working
          * with Roles</a>.</p> <p>You can paginate the results using the
          * <code>MaxItems</code> and <code>Marker</code> parameters.</p><p><h3>See
@@ -4638,7 +4697,7 @@ namespace Model
 
         /**
          * <p>Lists the IAM roles that have the specified path prefix. If there are none,
-         * the action returns an empty list. For more information about roles, go to <a
+         * the operation returns an empty list. For more information about roles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html">Working
          * with Roles</a>.</p> <p>You can paginate the results using the
          * <code>MaxItems</code> and <code>Marker</code> parameters.</p><p><h3>See
@@ -4652,7 +4711,7 @@ namespace Model
 
         /**
          * <p>Lists the IAM roles that have the specified path prefix. If there are none,
-         * the action returns an empty list. For more information about roles, go to <a
+         * the operation returns an empty list. For more information about roles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html">Working
          * with Roles</a>.</p> <p>You can paginate the results using the
          * <code>MaxItems</code> and <code>Marker</code> parameters.</p><p><h3>See
@@ -4700,8 +4759,8 @@ namespace Model
 
         /**
          * <p>Returns information about the SSH public keys associated with the specified
-         * IAM user. If there are none, the action returns an empty list.</p> <p>The SSH
-         * public keys returned by this action are used only for authenticating the IAM
+         * IAM user. If there are none, the operation returns an empty list.</p> <p>The SSH
+         * public keys returned by this operation are used only for authenticating the IAM
          * user to an AWS CodeCommit repository. For more information about using SSH keys
          * to authenticate to an AWS CodeCommit repository, see <a
          * href="http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html">Set
@@ -4716,8 +4775,8 @@ namespace Model
 
         /**
          * <p>Returns information about the SSH public keys associated with the specified
-         * IAM user. If there are none, the action returns an empty list.</p> <p>The SSH
-         * public keys returned by this action are used only for authenticating the IAM
+         * IAM user. If there are none, the operation returns an empty list.</p> <p>The SSH
+         * public keys returned by this operation are used only for authenticating the IAM
          * user to an AWS CodeCommit repository. For more information about using SSH keys
          * to authenticate to an AWS CodeCommit repository, see <a
          * href="http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html">Set
@@ -4734,8 +4793,8 @@ namespace Model
 
         /**
          * <p>Returns information about the SSH public keys associated with the specified
-         * IAM user. If there are none, the action returns an empty list.</p> <p>The SSH
-         * public keys returned by this action are used only for authenticating the IAM
+         * IAM user. If there are none, the operation returns an empty list.</p> <p>The SSH
+         * public keys returned by this operation are used only for authenticating the IAM
          * user to an AWS CodeCommit repository. For more information about using SSH keys
          * to authenticate to an AWS CodeCommit repository, see <a
          * href="http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html">Set
@@ -4752,14 +4811,14 @@ namespace Model
 
         /**
          * <p>Lists the server certificates stored in IAM that have the specified path
-         * prefix. If none exist, the action returns an empty list.</p> <p> You can
+         * prefix. If none exist, the operation returns an empty list.</p> <p> You can
          * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
          * parameters.</p> <p>For more information about working with server certificates,
-         * including a list of AWS services that can use the server certificates that you
-         * manage with IAM, go to <a
+         * see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html">Working
-         * with Server Certificates</a> in the <i>IAM User Guide</i>.</p><p><h3>See
-         * Also:</h3>   <a
+         * with Server Certificates</a> in the <i>IAM User Guide</i>. This topic also
+         * includes a list of AWS services that can use the server certificates that you
+         * manage with IAM.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListServerCertificates">AWS
          * API Reference</a></p>
          */
@@ -4767,14 +4826,14 @@ namespace Model
 
         /**
          * <p>Lists the server certificates stored in IAM that have the specified path
-         * prefix. If none exist, the action returns an empty list.</p> <p> You can
+         * prefix. If none exist, the operation returns an empty list.</p> <p> You can
          * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
          * parameters.</p> <p>For more information about working with server certificates,
-         * including a list of AWS services that can use the server certificates that you
-         * manage with IAM, go to <a
+         * see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html">Working
-         * with Server Certificates</a> in the <i>IAM User Guide</i>.</p><p><h3>See
-         * Also:</h3>   <a
+         * with Server Certificates</a> in the <i>IAM User Guide</i>. This topic also
+         * includes a list of AWS services that can use the server certificates that you
+         * manage with IAM.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListServerCertificates">AWS
          * API Reference</a></p>
          *
@@ -4784,14 +4843,14 @@ namespace Model
 
         /**
          * <p>Lists the server certificates stored in IAM that have the specified path
-         * prefix. If none exist, the action returns an empty list.</p> <p> You can
+         * prefix. If none exist, the operation returns an empty list.</p> <p> You can
          * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
          * parameters.</p> <p>For more information about working with server certificates,
-         * including a list of AWS services that can use the server certificates that you
-         * manage with IAM, go to <a
+         * see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html">Working
-         * with Server Certificates</a> in the <i>IAM User Guide</i>.</p><p><h3>See
-         * Also:</h3>   <a
+         * with Server Certificates</a> in the <i>IAM User Guide</i>. This topic also
+         * includes a list of AWS services that can use the server certificates that you
+         * manage with IAM.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListServerCertificates">AWS
          * API Reference</a></p>
          *
@@ -4801,8 +4860,8 @@ namespace Model
 
         /**
          * <p>Returns information about the service-specific credentials associated with
-         * the specified IAM user. If there are none, the action returns an empty list. The
-         * service-specific credentials returned by this action are used only for
+         * the specified IAM user. If there are none, the operation returns an empty list.
+         * The service-specific credentials returned by this operation are used only for
          * authenticating the IAM user to a specific service. For more information about
          * using service-specific credentials to authenticate to an AWS service, see <a
          * href="http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-gc.html">Set
@@ -4815,8 +4874,8 @@ namespace Model
 
         /**
          * <p>Returns information about the service-specific credentials associated with
-         * the specified IAM user. If there are none, the action returns an empty list. The
-         * service-specific credentials returned by this action are used only for
+         * the specified IAM user. If there are none, the operation returns an empty list.
+         * The service-specific credentials returned by this operation are used only for
          * authenticating the IAM user to a specific service. For more information about
          * using service-specific credentials to authenticate to an AWS service, see <a
          * href="http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-gc.html">Set
@@ -4831,8 +4890,8 @@ namespace Model
 
         /**
          * <p>Returns information about the service-specific credentials associated with
-         * the specified IAM user. If there are none, the action returns an empty list. The
-         * service-specific credentials returned by this action are used only for
+         * the specified IAM user. If there are none, the operation returns an empty list.
+         * The service-specific credentials returned by this operation are used only for
          * authenticating the IAM user to a specific service. For more information about
          * using service-specific credentials to authenticate to an AWS service, see <a
          * href="http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-gc.html">Set
@@ -4847,14 +4906,15 @@ namespace Model
 
         /**
          * <p>Returns information about the signing certificates associated with the
-         * specified IAM user. If there are none, the action returns an empty list.</p>
+         * specified IAM user. If there are none, the operation returns an empty list.</p>
          * <p>Although each user is limited to a small number of signing certificates, you
          * can still paginate the results using the <code>MaxItems</code> and
          * <code>Marker</code> parameters.</p> <p>If the <code>UserName</code> field is not
          * specified, the user name is determined implicitly based on the AWS access key ID
-         * used to sign the request for this API. Because this action works for access keys
-         * under the AWS account, you can use this action to manage root credentials even
-         * if the AWS account has no associated users.</p><p><h3>See Also:</h3>   <a
+         * used to sign the request for this API. Because this operation works for access
+         * keys under the AWS account, you can use this operation to manage AWS account
+         * root user credentials even if the AWS account has no associated
+         * users.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListSigningCertificates">AWS
          * API Reference</a></p>
          */
@@ -4862,14 +4922,15 @@ namespace Model
 
         /**
          * <p>Returns information about the signing certificates associated with the
-         * specified IAM user. If there are none, the action returns an empty list.</p>
+         * specified IAM user. If there are none, the operation returns an empty list.</p>
          * <p>Although each user is limited to a small number of signing certificates, you
          * can still paginate the results using the <code>MaxItems</code> and
          * <code>Marker</code> parameters.</p> <p>If the <code>UserName</code> field is not
          * specified, the user name is determined implicitly based on the AWS access key ID
-         * used to sign the request for this API. Because this action works for access keys
-         * under the AWS account, you can use this action to manage root credentials even
-         * if the AWS account has no associated users.</p><p><h3>See Also:</h3>   <a
+         * used to sign the request for this API. Because this operation works for access
+         * keys under the AWS account, you can use this operation to manage AWS account
+         * root user credentials even if the AWS account has no associated
+         * users.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListSigningCertificates">AWS
          * API Reference</a></p>
          *
@@ -4879,14 +4940,15 @@ namespace Model
 
         /**
          * <p>Returns information about the signing certificates associated with the
-         * specified IAM user. If there are none, the action returns an empty list.</p>
+         * specified IAM user. If there are none, the operation returns an empty list.</p>
          * <p>Although each user is limited to a small number of signing certificates, you
          * can still paginate the results using the <code>MaxItems</code> and
          * <code>Marker</code> parameters.</p> <p>If the <code>UserName</code> field is not
          * specified, the user name is determined implicitly based on the AWS access key ID
-         * used to sign the request for this API. Because this action works for access keys
-         * under the AWS account, you can use this action to manage root credentials even
-         * if the AWS account has no associated users.</p><p><h3>See Also:</h3>   <a
+         * used to sign the request for this API. Because this operation works for access
+         * keys under the AWS account, you can use this operation to manage AWS account
+         * root user credentials even if the AWS account has no associated
+         * users.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListSigningCertificates">AWS
          * API Reference</a></p>
          *
@@ -4903,7 +4965,7 @@ namespace Model
          * Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can
          * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
          * parameters. If there are no inline policies embedded with the specified user,
-         * the action returns an empty list.</p><p><h3>See Also:</h3>   <a
+         * the operation returns an empty list.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListUserPolicies">AWS
          * API Reference</a></p>
          */
@@ -4918,7 +4980,7 @@ namespace Model
          * Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can
          * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
          * parameters. If there are no inline policies embedded with the specified user,
-         * the action returns an empty list.</p><p><h3>See Also:</h3>   <a
+         * the operation returns an empty list.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListUserPolicies">AWS
          * API Reference</a></p>
          *
@@ -4935,7 +4997,7 @@ namespace Model
          * Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can
          * paginate the results using the <code>MaxItems</code> and <code>Marker</code>
          * parameters. If there are no inline policies embedded with the specified user,
-         * the action returns an empty list.</p><p><h3>See Also:</h3>   <a
+         * the operation returns an empty list.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListUserPolicies">AWS
          * API Reference</a></p>
          *
@@ -4945,10 +5007,10 @@ namespace Model
 
         /**
          * <p>Lists the IAM users that have the specified path prefix. If no path prefix is
-         * specified, the action returns all users in the AWS account. If there are none,
-         * the action returns an empty list.</p> <p>You can paginate the results using the
-         * <code>MaxItems</code> and <code>Marker</code> parameters.</p><p><h3>See
-         * Also:</h3>   <a
+         * specified, the operation returns all users in the AWS account. If there are
+         * none, the operation returns an empty list.</p> <p>You can paginate the results
+         * using the <code>MaxItems</code> and <code>Marker</code>
+         * parameters.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListUsers">AWS API
          * Reference</a></p>
          */
@@ -4956,10 +5018,10 @@ namespace Model
 
         /**
          * <p>Lists the IAM users that have the specified path prefix. If no path prefix is
-         * specified, the action returns all users in the AWS account. If there are none,
-         * the action returns an empty list.</p> <p>You can paginate the results using the
-         * <code>MaxItems</code> and <code>Marker</code> parameters.</p><p><h3>See
-         * Also:</h3>   <a
+         * specified, the operation returns all users in the AWS account. If there are
+         * none, the operation returns an empty list.</p> <p>You can paginate the results
+         * using the <code>MaxItems</code> and <code>Marker</code>
+         * parameters.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListUsers">AWS API
          * Reference</a></p>
          *
@@ -4969,10 +5031,10 @@ namespace Model
 
         /**
          * <p>Lists the IAM users that have the specified path prefix. If no path prefix is
-         * specified, the action returns all users in the AWS account. If there are none,
-         * the action returns an empty list.</p> <p>You can paginate the results using the
-         * <code>MaxItems</code> and <code>Marker</code> parameters.</p><p><h3>See
-         * Also:</h3>   <a
+         * specified, the operation returns all users in the AWS account. If there are
+         * none, the operation returns an empty list.</p> <p>You can paginate the results
+         * using the <code>MaxItems</code> and <code>Marker</code>
+         * parameters.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ListUsers">AWS API
          * Reference</a></p>
          *
@@ -4982,8 +5044,8 @@ namespace Model
 
         /**
          * <p>Lists the virtual MFA devices defined in the AWS account by assignment
-         * status. If you do not specify an assignment status, the action returns a list of
-         * all virtual MFA devices. Assignment status can be <code>Assigned</code>,
+         * status. If you do not specify an assignment status, the operation returns a list
+         * of all virtual MFA devices. Assignment status can be <code>Assigned</code>,
          * <code>Unassigned</code>, or <code>Any</code>.</p> <p>You can paginate the
          * results using the <code>MaxItems</code> and <code>Marker</code>
          * parameters.</p><p><h3>See Also:</h3>   <a
@@ -4994,8 +5056,8 @@ namespace Model
 
         /**
          * <p>Lists the virtual MFA devices defined in the AWS account by assignment
-         * status. If you do not specify an assignment status, the action returns a list of
-         * all virtual MFA devices. Assignment status can be <code>Assigned</code>,
+         * status. If you do not specify an assignment status, the operation returns a list
+         * of all virtual MFA devices. Assignment status can be <code>Assigned</code>,
          * <code>Unassigned</code>, or <code>Any</code>.</p> <p>You can paginate the
          * results using the <code>MaxItems</code> and <code>Marker</code>
          * parameters.</p><p><h3>See Also:</h3>   <a
@@ -5008,8 +5070,8 @@ namespace Model
 
         /**
          * <p>Lists the virtual MFA devices defined in the AWS account by assignment
-         * status. If you do not specify an assignment status, the action returns a list of
-         * all virtual MFA devices. Assignment status can be <code>Assigned</code>,
+         * status. If you do not specify an assignment status, the operation returns a list
+         * of all virtual MFA devices. Assignment status can be <code>Assigned</code>,
          * <code>Unassigned</code>, or <code>Any</code>.</p> <p>You can paginate the
          * results using the <code>MaxItems</code> and <code>Marker</code>
          * parameters.</p><p><h3>See Also:</h3>   <a
@@ -5257,8 +5319,8 @@ namespace Model
         /**
          * <p>Removes the specified client ID (also known as audience) from the list of
          * client IDs registered for the specified IAM OpenID Connect (OIDC) provider
-         * resource object.</p> <p>This action is idempotent; it does not fail or return an
-         * error if you try to remove a client ID that does not exist.</p><p><h3>See
+         * resource object.</p> <p>This operation is idempotent; it does not fail or return
+         * an error if you try to remove a client ID that does not exist.</p><p><h3>See
          * Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/RemoveClientIDFromOpenIDConnectProvider">AWS
          * API Reference</a></p>
@@ -5268,8 +5330,8 @@ namespace Model
         /**
          * <p>Removes the specified client ID (also known as audience) from the list of
          * client IDs registered for the specified IAM OpenID Connect (OIDC) provider
-         * resource object.</p> <p>This action is idempotent; it does not fail or return an
-         * error if you try to remove a client ID that does not exist.</p><p><h3>See
+         * resource object.</p> <p>This operation is idempotent; it does not fail or return
+         * an error if you try to remove a client ID that does not exist.</p><p><h3>See
          * Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/RemoveClientIDFromOpenIDConnectProvider">AWS
          * API Reference</a></p>
@@ -5281,8 +5343,8 @@ namespace Model
         /**
          * <p>Removes the specified client ID (also known as audience) from the list of
          * client IDs registered for the specified IAM OpenID Connect (OIDC) provider
-         * resource object.</p> <p>This action is idempotent; it does not fail or return an
-         * error if you try to remove a client ID that does not exist.</p><p><h3>See
+         * resource object.</p> <p>This operation is idempotent; it does not fail or return
+         * an error if you try to remove a client ID that does not exist.</p><p><h3>See
          * Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/RemoveClientIDFromOpenIDConnectProvider">AWS
          * API Reference</a></p>
@@ -5293,11 +5355,11 @@ namespace Model
 
         /**
          * <p>Removes the specified IAM role from the specified EC2 instance profile.</p>
-         * <important> <p>Make sure you do not have any Amazon EC2 instances running with
-         * the role you are about to remove from the instance profile. Removing a role from
-         * an instance profile that is associated with a running instance might break any
-         * applications running on the instance.</p> </important> <p> For more information
-         * about IAM roles, go to <a
+         * <important> <p>Make sure that you do not have any Amazon EC2 instances running
+         * with the role you are about to remove from the instance profile. Removing a role
+         * from an instance profile that is associated with a running instance might break
+         * any applications running on the instance.</p> </important> <p> For more
+         * information about IAM roles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html">Working
          * with Roles</a>. For more information about instance profiles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html">About
@@ -5309,11 +5371,11 @@ namespace Model
 
         /**
          * <p>Removes the specified IAM role from the specified EC2 instance profile.</p>
-         * <important> <p>Make sure you do not have any Amazon EC2 instances running with
-         * the role you are about to remove from the instance profile. Removing a role from
-         * an instance profile that is associated with a running instance might break any
-         * applications running on the instance.</p> </important> <p> For more information
-         * about IAM roles, go to <a
+         * <important> <p>Make sure that you do not have any Amazon EC2 instances running
+         * with the role you are about to remove from the instance profile. Removing a role
+         * from an instance profile that is associated with a running instance might break
+         * any applications running on the instance.</p> </important> <p> For more
+         * information about IAM roles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html">Working
          * with Roles</a>. For more information about instance profiles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html">About
@@ -5327,11 +5389,11 @@ namespace Model
 
         /**
          * <p>Removes the specified IAM role from the specified EC2 instance profile.</p>
-         * <important> <p>Make sure you do not have any Amazon EC2 instances running with
-         * the role you are about to remove from the instance profile. Removing a role from
-         * an instance profile that is associated with a running instance might break any
-         * applications running on the instance.</p> </important> <p> For more information
-         * about IAM roles, go to <a
+         * <important> <p>Make sure that you do not have any Amazon EC2 instances running
+         * with the role you are about to remove from the instance profile. Removing a role
+         * from an instance profile that is associated with a running instance might break
+         * any applications running on the instance.</p> </important> <p> For more
+         * information about IAM roles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html">Working
          * with Roles</a>. For more information about instance profiles, go to <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html">About
@@ -5447,7 +5509,7 @@ namespace Model
 
         /**
          * <p>Sets the specified version of the specified policy as the policy's default
-         * (operative) version.</p> <p>This action affects all users, groups, and roles
+         * (operative) version.</p> <p>This operation affects all users, groups, and roles
          * that the policy is attached to. To list the users, groups, and roles that the
          * policy is attached to, use the <a>ListEntitiesForPolicy</a> API.</p> <p>For
          * information about managed policies, see <a
@@ -5461,7 +5523,7 @@ namespace Model
 
         /**
          * <p>Sets the specified version of the specified policy as the policy's default
-         * (operative) version.</p> <p>This action affects all users, groups, and roles
+         * (operative) version.</p> <p>This operation affects all users, groups, and roles
          * that the policy is attached to. To list the users, groups, and roles that the
          * policy is attached to, use the <a>ListEntitiesForPolicy</a> API.</p> <p>For
          * information about managed policies, see <a
@@ -5477,7 +5539,7 @@ namespace Model
 
         /**
          * <p>Sets the specified version of the specified policy as the policy's default
-         * (operative) version.</p> <p>This action affects all users, groups, and roles
+         * (operative) version.</p> <p>This operation affects all users, groups, and roles
          * that the policy is attached to. To list the users, groups, and roles that the
          * policy is attached to, use the <a>ListEntitiesForPolicy</a> API.</p> <p>For
          * information about managed policies, see <a
@@ -5493,12 +5555,12 @@ namespace Model
 
         /**
          * <p>Simulate how a set of IAM policies and optionally a resource-based policy
-         * works with a list of API actions and AWS resources to determine the policies'
+         * works with a list of API operations and AWS resources to determine the policies'
          * effective permissions. The policies are provided as strings.</p> <p>The
-         * simulation does not perform the API actions; it only checks the authorization to
-         * determine if the simulated policies allow or deny the actions.</p> <p>If you
-         * want to simulate existing policies attached to an IAM user, group, or role, use
-         * <a>SimulatePrincipalPolicy</a> instead.</p> <p>Context keys are variables
+         * simulation does not perform the API operations; it only checks the authorization
+         * to determine if the simulated policies allow or deny the operations.</p> <p>If
+         * you want to simulate existing policies attached to an IAM user, group, or role,
+         * use <a>SimulatePrincipalPolicy</a> instead.</p> <p>Context keys are variables
          * maintained by AWS and its services that provide details about the context of an
          * API query request. You can use the <code>Condition</code> element of an IAM
          * policy to evaluate context keys. To get the list of context keys that the
@@ -5513,12 +5575,12 @@ namespace Model
 
         /**
          * <p>Simulate how a set of IAM policies and optionally a resource-based policy
-         * works with a list of API actions and AWS resources to determine the policies'
+         * works with a list of API operations and AWS resources to determine the policies'
          * effective permissions. The policies are provided as strings.</p> <p>The
-         * simulation does not perform the API actions; it only checks the authorization to
-         * determine if the simulated policies allow or deny the actions.</p> <p>If you
-         * want to simulate existing policies attached to an IAM user, group, or role, use
-         * <a>SimulatePrincipalPolicy</a> instead.</p> <p>Context keys are variables
+         * simulation does not perform the API operations; it only checks the authorization
+         * to determine if the simulated policies allow or deny the operations.</p> <p>If
+         * you want to simulate existing policies attached to an IAM user, group, or role,
+         * use <a>SimulatePrincipalPolicy</a> instead.</p> <p>Context keys are variables
          * maintained by AWS and its services that provide details about the context of an
          * API query request. You can use the <code>Condition</code> element of an IAM
          * policy to evaluate context keys. To get the list of context keys that the
@@ -5535,12 +5597,12 @@ namespace Model
 
         /**
          * <p>Simulate how a set of IAM policies and optionally a resource-based policy
-         * works with a list of API actions and AWS resources to determine the policies'
+         * works with a list of API operations and AWS resources to determine the policies'
          * effective permissions. The policies are provided as strings.</p> <p>The
-         * simulation does not perform the API actions; it only checks the authorization to
-         * determine if the simulated policies allow or deny the actions.</p> <p>If you
-         * want to simulate existing policies attached to an IAM user, group, or role, use
-         * <a>SimulatePrincipalPolicy</a> instead.</p> <p>Context keys are variables
+         * simulation does not perform the API operations; it only checks the authorization
+         * to determine if the simulated policies allow or deny the operations.</p> <p>If
+         * you want to simulate existing policies attached to an IAM user, group, or role,
+         * use <a>SimulatePrincipalPolicy</a> instead.</p> <p>Context keys are variables
          * maintained by AWS and its services that provide details about the context of an
          * API query request. You can use the <code>Condition</code> element of an IAM
          * policy to evaluate context keys. To get the list of context keys that the
@@ -5557,17 +5619,17 @@ namespace Model
 
         /**
          * <p>Simulate how a set of IAM policies attached to an IAM entity works with a
-         * list of API actions and AWS resources to determine the policies' effective
+         * list of API operations and AWS resources to determine the policies' effective
          * permissions. The entity can be an IAM user, group, or role. If you specify a
          * user, then the simulation also includes all of the policies that are attached to
-         * groups that the user belongs to .</p> <p>You can optionally include a list of
-         * one or more additional policies specified as strings to include in the
-         * simulation. If you want to simulate only policies specified as strings, use
+         * groups that the user belongs to.</p> <p>You can optionally include a list of one
+         * or more additional policies specified as strings to include in the simulation.
+         * If you want to simulate only policies specified as strings, use
          * <a>SimulateCustomPolicy</a> instead.</p> <p>You can also optionally include one
          * resource-based policy to be evaluated with each of the resources included in the
-         * simulation.</p> <p>The simulation does not perform the API actions, it only
+         * simulation.</p> <p>The simulation does not perform the API operations, it only
          * checks the authorization to determine if the simulated policies allow or deny
-         * the actions.</p> <p> <b>Note:</b> This API discloses information about the
+         * the operations.</p> <p> <b>Note:</b> This API discloses information about the
          * permissions granted to other users. If you do not want users to see other user's
          * permissions, then consider allowing them to use <a>SimulateCustomPolicy</a>
          * instead.</p> <p>Context keys are variables maintained by AWS and its services
@@ -5584,17 +5646,17 @@ namespace Model
 
         /**
          * <p>Simulate how a set of IAM policies attached to an IAM entity works with a
-         * list of API actions and AWS resources to determine the policies' effective
+         * list of API operations and AWS resources to determine the policies' effective
          * permissions. The entity can be an IAM user, group, or role. If you specify a
          * user, then the simulation also includes all of the policies that are attached to
-         * groups that the user belongs to .</p> <p>You can optionally include a list of
-         * one or more additional policies specified as strings to include in the
-         * simulation. If you want to simulate only policies specified as strings, use
+         * groups that the user belongs to.</p> <p>You can optionally include a list of one
+         * or more additional policies specified as strings to include in the simulation.
+         * If you want to simulate only policies specified as strings, use
          * <a>SimulateCustomPolicy</a> instead.</p> <p>You can also optionally include one
          * resource-based policy to be evaluated with each of the resources included in the
-         * simulation.</p> <p>The simulation does not perform the API actions, it only
+         * simulation.</p> <p>The simulation does not perform the API operations, it only
          * checks the authorization to determine if the simulated policies allow or deny
-         * the actions.</p> <p> <b>Note:</b> This API discloses information about the
+         * the operations.</p> <p> <b>Note:</b> This API discloses information about the
          * permissions granted to other users. If you do not want users to see other user's
          * permissions, then consider allowing them to use <a>SimulateCustomPolicy</a>
          * instead.</p> <p>Context keys are variables maintained by AWS and its services
@@ -5613,17 +5675,17 @@ namespace Model
 
         /**
          * <p>Simulate how a set of IAM policies attached to an IAM entity works with a
-         * list of API actions and AWS resources to determine the policies' effective
+         * list of API operations and AWS resources to determine the policies' effective
          * permissions. The entity can be an IAM user, group, or role. If you specify a
          * user, then the simulation also includes all of the policies that are attached to
-         * groups that the user belongs to .</p> <p>You can optionally include a list of
-         * one or more additional policies specified as strings to include in the
-         * simulation. If you want to simulate only policies specified as strings, use
+         * groups that the user belongs to.</p> <p>You can optionally include a list of one
+         * or more additional policies specified as strings to include in the simulation.
+         * If you want to simulate only policies specified as strings, use
          * <a>SimulateCustomPolicy</a> instead.</p> <p>You can also optionally include one
          * resource-based policy to be evaluated with each of the resources included in the
-         * simulation.</p> <p>The simulation does not perform the API actions, it only
+         * simulation.</p> <p>The simulation does not perform the API operations, it only
          * checks the authorization to determine if the simulated policies allow or deny
-         * the actions.</p> <p> <b>Note:</b> This API discloses information about the
+         * the operations.</p> <p> <b>Note:</b> This API discloses information about the
          * permissions granted to other users. If you do not want users to see other user's
          * permissions, then consider allowing them to use <a>SimulateCustomPolicy</a>
          * instead.</p> <p>Context keys are variables maintained by AWS and its services
@@ -5642,13 +5704,13 @@ namespace Model
 
         /**
          * <p>Changes the status of the specified access key from Active to Inactive, or
-         * vice versa. This action can be used to disable a user's key as part of a key
-         * rotation work flow.</p> <p>If the <code>UserName</code> field is not specified,
-         * the UserName is determined implicitly based on the AWS access key ID used to
-         * sign the request. Because this action works for access keys under the AWS
-         * account, you can use this action to manage root credentials even if the AWS
-         * account has no associated users.</p> <p>For information about rotating keys, see
-         * <a
+         * vice versa. This operation can be used to disable a user's key as part of a key
+         * rotation workflow.</p> <p>If the <code>UserName</code> field is not specified,
+         * the user name is determined implicitly based on the AWS access key ID used to
+         * sign the request. Because this operation works for access keys under the AWS
+         * account, you can use this operation to manage AWS account root user credentials
+         * even if the AWS account has no associated users.</p> <p>For information about
+         * rotating keys, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/ManagingCredentials.html">Managing
          * Keys and Certificates</a> in the <i>IAM User Guide</i>.</p><p><h3>See Also:</h3>
          * <a
@@ -5659,13 +5721,13 @@ namespace Model
 
         /**
          * <p>Changes the status of the specified access key from Active to Inactive, or
-         * vice versa. This action can be used to disable a user's key as part of a key
-         * rotation work flow.</p> <p>If the <code>UserName</code> field is not specified,
-         * the UserName is determined implicitly based on the AWS access key ID used to
-         * sign the request. Because this action works for access keys under the AWS
-         * account, you can use this action to manage root credentials even if the AWS
-         * account has no associated users.</p> <p>For information about rotating keys, see
-         * <a
+         * vice versa. This operation can be used to disable a user's key as part of a key
+         * rotation workflow.</p> <p>If the <code>UserName</code> field is not specified,
+         * the user name is determined implicitly based on the AWS access key ID used to
+         * sign the request. Because this operation works for access keys under the AWS
+         * account, you can use this operation to manage AWS account root user credentials
+         * even if the AWS account has no associated users.</p> <p>For information about
+         * rotating keys, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/ManagingCredentials.html">Managing
          * Keys and Certificates</a> in the <i>IAM User Guide</i>.</p><p><h3>See Also:</h3>
          * <a
@@ -5678,13 +5740,13 @@ namespace Model
 
         /**
          * <p>Changes the status of the specified access key from Active to Inactive, or
-         * vice versa. This action can be used to disable a user's key as part of a key
-         * rotation work flow.</p> <p>If the <code>UserName</code> field is not specified,
-         * the UserName is determined implicitly based on the AWS access key ID used to
-         * sign the request. Because this action works for access keys under the AWS
-         * account, you can use this action to manage root credentials even if the AWS
-         * account has no associated users.</p> <p>For information about rotating keys, see
-         * <a
+         * vice versa. This operation can be used to disable a user's key as part of a key
+         * rotation workflow.</p> <p>If the <code>UserName</code> field is not specified,
+         * the user name is determined implicitly based on the AWS access key ID used to
+         * sign the request. Because this operation works for access keys under the AWS
+         * account, you can use this operation to manage AWS account root user credentials
+         * even if the AWS account has no associated users.</p> <p>For information about
+         * rotating keys, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/ManagingCredentials.html">Managing
          * Keys and Certificates</a> in the <i>IAM User Guide</i>.</p><p><h3>See Also:</h3>
          * <a
@@ -5696,12 +5758,14 @@ namespace Model
         virtual void UpdateAccessKeyAsync(const Model::UpdateAccessKeyRequest& request, const UpdateAccessKeyResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
 
         /**
-         * <p>Updates the password policy settings for the AWS account.</p> <note> <p>This
-         * action does not support partial updates. No parameters are required, but if you
-         * do not specify a parameter, that parameter's value reverts to its default value.
-         * See the <b>Request Parameters</b> section for each parameter's default
-         * value.</p> </note> <p> For more information about using a password policy, see
-         * <a
+         * <p>Updates the password policy settings for the AWS account.</p> <note> <ul>
+         * <li> <p>This operation does not support partial updates. No parameters are
+         * required, but if you do not specify a parameter, that parameter's value reverts
+         * to its default value. See the <b>Request Parameters</b> section for each
+         * parameter's default value. Also note that some parameters do not allow the
+         * default parameter to be explicitly set. Instead, to invoke the default value, do
+         * not include that parameter when you invoke the operation.</p> </li> </ul>
+         * </note> <p> For more information about using a password policy, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_ManagingPasswordPolicies.html">Managing
          * an IAM Password Policy</a> in the <i>IAM User Guide</i>.</p><p><h3>See
          * Also:</h3>   <a
@@ -5711,12 +5775,14 @@ namespace Model
         virtual Model::UpdateAccountPasswordPolicyOutcome UpdateAccountPasswordPolicy(const Model::UpdateAccountPasswordPolicyRequest& request) const;
 
         /**
-         * <p>Updates the password policy settings for the AWS account.</p> <note> <p>This
-         * action does not support partial updates. No parameters are required, but if you
-         * do not specify a parameter, that parameter's value reverts to its default value.
-         * See the <b>Request Parameters</b> section for each parameter's default
-         * value.</p> </note> <p> For more information about using a password policy, see
-         * <a
+         * <p>Updates the password policy settings for the AWS account.</p> <note> <ul>
+         * <li> <p>This operation does not support partial updates. No parameters are
+         * required, but if you do not specify a parameter, that parameter's value reverts
+         * to its default value. See the <b>Request Parameters</b> section for each
+         * parameter's default value. Also note that some parameters do not allow the
+         * default parameter to be explicitly set. Instead, to invoke the default value, do
+         * not include that parameter when you invoke the operation.</p> </li> </ul>
+         * </note> <p> For more information about using a password policy, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_ManagingPasswordPolicies.html">Managing
          * an IAM Password Policy</a> in the <i>IAM User Guide</i>.</p><p><h3>See
          * Also:</h3>   <a
@@ -5728,12 +5794,14 @@ namespace Model
         virtual Model::UpdateAccountPasswordPolicyOutcomeCallable UpdateAccountPasswordPolicyCallable(const Model::UpdateAccountPasswordPolicyRequest& request) const;
 
         /**
-         * <p>Updates the password policy settings for the AWS account.</p> <note> <p>This
-         * action does not support partial updates. No parameters are required, but if you
-         * do not specify a parameter, that parameter's value reverts to its default value.
-         * See the <b>Request Parameters</b> section for each parameter's default
-         * value.</p> </note> <p> For more information about using a password policy, see
-         * <a
+         * <p>Updates the password policy settings for the AWS account.</p> <note> <ul>
+         * <li> <p>This operation does not support partial updates. No parameters are
+         * required, but if you do not specify a parameter, that parameter's value reverts
+         * to its default value. See the <b>Request Parameters</b> section for each
+         * parameter's default value. Also note that some parameters do not allow the
+         * default parameter to be explicitly set. Instead, to invoke the default value, do
+         * not include that parameter when you invoke the operation.</p> </li> </ul>
+         * </note> <p> For more information about using a password policy, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_ManagingPasswordPolicies.html">Managing
          * an IAM Password Policy</a> in the <i>IAM User Guide</i>.</p><p><h3>See
          * Also:</h3>   <a
@@ -5789,14 +5857,15 @@ namespace Model
          * <p> You should understand the implications of changing a group's path or name.
          * For more information, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_WorkingWithGroupsAndUsers.html">Renaming
-         * Users and Groups</a> in the <i>IAM User Guide</i>.</p> </important> <note> <p>To
-         * change an IAM group name the requester must have appropriate permissions on both
-         * the source object and the target object. For example, to change "Managers" to
-         * "MGRs", the entity making the request must have permission on both "Managers"
-         * and "MGRs", or must have permission on all (*). For more information about
-         * permissions, see <a
-         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/PermissionsAndPolicies.html">Permissions
-         * and Policies</a>. </p> </note><p><h3>See Also:</h3>   <a
+         * Users and Groups</a> in the <i>IAM User Guide</i>.</p> </important> <note>
+         * <p>The person making the request (the principal), must have permission to change
+         * the role group with the old name and the new name. For example, to change the
+         * group named <code>Managers</code> to <code>MGRs</code>, the principal must have
+         * a policy that allows them to update both groups. If the principal has permission
+         * to update the <code>Managers</code> group, but not the <code>MGRs</code> group,
+         * then the update fails. For more information about permissions, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/access.html">Access
+         * Management</a>. </p> </note><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateGroup">AWS API
          * Reference</a></p>
          */
@@ -5807,14 +5876,15 @@ namespace Model
          * <p> You should understand the implications of changing a group's path or name.
          * For more information, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_WorkingWithGroupsAndUsers.html">Renaming
-         * Users and Groups</a> in the <i>IAM User Guide</i>.</p> </important> <note> <p>To
-         * change an IAM group name the requester must have appropriate permissions on both
-         * the source object and the target object. For example, to change "Managers" to
-         * "MGRs", the entity making the request must have permission on both "Managers"
-         * and "MGRs", or must have permission on all (*). For more information about
-         * permissions, see <a
-         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/PermissionsAndPolicies.html">Permissions
-         * and Policies</a>. </p> </note><p><h3>See Also:</h3>   <a
+         * Users and Groups</a> in the <i>IAM User Guide</i>.</p> </important> <note>
+         * <p>The person making the request (the principal), must have permission to change
+         * the role group with the old name and the new name. For example, to change the
+         * group named <code>Managers</code> to <code>MGRs</code>, the principal must have
+         * a policy that allows them to update both groups. If the principal has permission
+         * to update the <code>Managers</code> group, but not the <code>MGRs</code> group,
+         * then the update fails. For more information about permissions, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/access.html">Access
+         * Management</a>. </p> </note><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateGroup">AWS API
          * Reference</a></p>
          *
@@ -5827,14 +5897,15 @@ namespace Model
          * <p> You should understand the implications of changing a group's path or name.
          * For more information, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_WorkingWithGroupsAndUsers.html">Renaming
-         * Users and Groups</a> in the <i>IAM User Guide</i>.</p> </important> <note> <p>To
-         * change an IAM group name the requester must have appropriate permissions on both
-         * the source object and the target object. For example, to change "Managers" to
-         * "MGRs", the entity making the request must have permission on both "Managers"
-         * and "MGRs", or must have permission on all (*). For more information about
-         * permissions, see <a
-         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/PermissionsAndPolicies.html">Permissions
-         * and Policies</a>. </p> </note><p><h3>See Also:</h3>   <a
+         * Users and Groups</a> in the <i>IAM User Guide</i>.</p> </important> <note>
+         * <p>The person making the request (the principal), must have permission to change
+         * the role group with the old name and the new name. For example, to change the
+         * group named <code>Managers</code> to <code>MGRs</code>, the principal must have
+         * a policy that allows them to update both groups. If the principal has permission
+         * to update the <code>Managers</code> group, but not the <code>MGRs</code> group,
+         * then the update fails. For more information about permissions, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/access.html">Access
+         * Management</a>. </p> </note><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateGroup">AWS API
          * Reference</a></p>
          *
@@ -5882,16 +5953,16 @@ namespace Model
         /**
          * <p>Replaces the existing list of server certificate thumbprints associated with
          * an OpenID Connect (OIDC) provider resource object with a new list of
-         * thumbprints.</p> <p>The list that you pass with this action completely replaces
-         * the existing list of thumbprints. (The lists are not merged.)</p> <p>Typically,
-         * you need to update a thumbprint only when the identity provider's certificate
-         * changes, which occurs rarely. However, if the provider's certificate <i>does</i>
-         * change, any attempt to assume an IAM role that specifies the OIDC provider as a
-         * principal fails until the certificate thumbprint is updated.</p> <note>
-         * <p>Because trust for the OIDC provider is ultimately derived from the provider's
-         * certificate and is validated by the thumbprint, it is a best practice to limit
-         * access to the <code>UpdateOpenIDConnectProviderThumbprint</code> action to
-         * highly-privileged users.</p> </note><p><h3>See Also:</h3>   <a
+         * thumbprints.</p> <p>The list that you pass with this operation completely
+         * replaces the existing list of thumbprints. (The lists are not merged.)</p>
+         * <p>Typically, you need to update a thumbprint only when the identity provider's
+         * certificate changes, which occurs rarely. However, if the provider's certificate
+         * <i>does</i> change, any attempt to assume an IAM role that specifies the OIDC
+         * provider as a principal fails until the certificate thumbprint is updated.</p>
+         * <note> <p>Because trust for the OIDC provider is derived from the provider's
+         * certificate and is validated by the thumbprint, it is best to limit access to
+         * the <code>UpdateOpenIDConnectProviderThumbprint</code> operation to highly
+         * privileged users.</p> </note><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateOpenIDConnectProviderThumbprint">AWS
          * API Reference</a></p>
          */
@@ -5900,16 +5971,16 @@ namespace Model
         /**
          * <p>Replaces the existing list of server certificate thumbprints associated with
          * an OpenID Connect (OIDC) provider resource object with a new list of
-         * thumbprints.</p> <p>The list that you pass with this action completely replaces
-         * the existing list of thumbprints. (The lists are not merged.)</p> <p>Typically,
-         * you need to update a thumbprint only when the identity provider's certificate
-         * changes, which occurs rarely. However, if the provider's certificate <i>does</i>
-         * change, any attempt to assume an IAM role that specifies the OIDC provider as a
-         * principal fails until the certificate thumbprint is updated.</p> <note>
-         * <p>Because trust for the OIDC provider is ultimately derived from the provider's
-         * certificate and is validated by the thumbprint, it is a best practice to limit
-         * access to the <code>UpdateOpenIDConnectProviderThumbprint</code> action to
-         * highly-privileged users.</p> </note><p><h3>See Also:</h3>   <a
+         * thumbprints.</p> <p>The list that you pass with this operation completely
+         * replaces the existing list of thumbprints. (The lists are not merged.)</p>
+         * <p>Typically, you need to update a thumbprint only when the identity provider's
+         * certificate changes, which occurs rarely. However, if the provider's certificate
+         * <i>does</i> change, any attempt to assume an IAM role that specifies the OIDC
+         * provider as a principal fails until the certificate thumbprint is updated.</p>
+         * <note> <p>Because trust for the OIDC provider is derived from the provider's
+         * certificate and is validated by the thumbprint, it is best to limit access to
+         * the <code>UpdateOpenIDConnectProviderThumbprint</code> operation to highly
+         * privileged users.</p> </note><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateOpenIDConnectProviderThumbprint">AWS
          * API Reference</a></p>
          *
@@ -5920,16 +5991,16 @@ namespace Model
         /**
          * <p>Replaces the existing list of server certificate thumbprints associated with
          * an OpenID Connect (OIDC) provider resource object with a new list of
-         * thumbprints.</p> <p>The list that you pass with this action completely replaces
-         * the existing list of thumbprints. (The lists are not merged.)</p> <p>Typically,
-         * you need to update a thumbprint only when the identity provider's certificate
-         * changes, which occurs rarely. However, if the provider's certificate <i>does</i>
-         * change, any attempt to assume an IAM role that specifies the OIDC provider as a
-         * principal fails until the certificate thumbprint is updated.</p> <note>
-         * <p>Because trust for the OIDC provider is ultimately derived from the provider's
-         * certificate and is validated by the thumbprint, it is a best practice to limit
-         * access to the <code>UpdateOpenIDConnectProviderThumbprint</code> action to
-         * highly-privileged users.</p> </note><p><h3>See Also:</h3>   <a
+         * thumbprints.</p> <p>The list that you pass with this operation completely
+         * replaces the existing list of thumbprints. (The lists are not merged.)</p>
+         * <p>Typically, you need to update a thumbprint only when the identity provider's
+         * certificate changes, which occurs rarely. However, if the provider's certificate
+         * <i>does</i> change, any attempt to assume an IAM role that specifies the OIDC
+         * provider as a principal fails until the certificate thumbprint is updated.</p>
+         * <note> <p>Because trust for the OIDC provider is derived from the provider's
+         * certificate and is validated by the thumbprint, it is best to limit access to
+         * the <code>UpdateOpenIDConnectProviderThumbprint</code> operation to highly
+         * privileged users.</p> </note><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateOpenIDConnectProviderThumbprint">AWS
          * API Reference</a></p>
          *
@@ -5938,14 +6009,46 @@ namespace Model
         virtual void UpdateOpenIDConnectProviderThumbprintAsync(const Model::UpdateOpenIDConnectProviderThumbprintRequest& request, const UpdateOpenIDConnectProviderThumbprintResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
 
         /**
-         * <p>Modifies the description of a role.</p><p><h3>See Also:</h3>   <a
+         * <p>Updates the description or maximum session duration setting of a
+         * role.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateRole">AWS API
+         * Reference</a></p>
+         */
+        virtual Model::UpdateRoleOutcome UpdateRole(const Model::UpdateRoleRequest& request) const;
+
+        /**
+         * <p>Updates the description or maximum session duration setting of a
+         * role.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateRole">AWS API
+         * Reference</a></p>
+         *
+         * returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        virtual Model::UpdateRoleOutcomeCallable UpdateRoleCallable(const Model::UpdateRoleRequest& request) const;
+
+        /**
+         * <p>Updates the description or maximum session duration setting of a
+         * role.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateRole">AWS API
+         * Reference</a></p>
+         *
+         * Queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        virtual void UpdateRoleAsync(const Model::UpdateRoleRequest& request, const UpdateRoleResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
+
+        /**
+         * <p>Use instead.</p> <p>Modifies only the description of a role. This operation
+         * performs the same function as the <code>Description</code> parameter in the
+         * <code>UpdateRole</code> operation.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateRoleDescription">AWS
          * API Reference</a></p>
          */
         virtual Model::UpdateRoleDescriptionOutcome UpdateRoleDescription(const Model::UpdateRoleDescriptionRequest& request) const;
 
         /**
-         * <p>Modifies the description of a role.</p><p><h3>See Also:</h3>   <a
+         * <p>Use instead.</p> <p>Modifies only the description of a role. This operation
+         * performs the same function as the <code>Description</code> parameter in the
+         * <code>UpdateRole</code> operation.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateRoleDescription">AWS
          * API Reference</a></p>
          *
@@ -5954,7 +6057,9 @@ namespace Model
         virtual Model::UpdateRoleDescriptionOutcomeCallable UpdateRoleDescriptionCallable(const Model::UpdateRoleDescriptionRequest& request) const;
 
         /**
-         * <p>Modifies the description of a role.</p><p><h3>See Also:</h3>   <a
+         * <p>Use instead.</p> <p>Modifies only the description of a role. This operation
+         * performs the same function as the <code>Description</code> parameter in the
+         * <code>UpdateRole</code> operation.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateRoleDescription">AWS
          * API Reference</a></p>
          *
@@ -5998,9 +6103,9 @@ namespace Model
 
         /**
          * <p>Sets the status of an IAM user's SSH public key to active or inactive. SSH
-         * public keys that are inactive cannot be used for authentication. This action can
-         * be used to disable a user's SSH public key as part of a key rotation work
-         * flow.</p> <p>The SSH public key affected by this action is used only for
+         * public keys that are inactive cannot be used for authentication. This operation
+         * can be used to disable a user's SSH public key as part of a key rotation work
+         * flow.</p> <p>The SSH public key affected by this operation is used only for
          * authenticating the associated IAM user to an AWS CodeCommit repository. For more
          * information about using SSH keys to authenticate to an AWS CodeCommit
          * repository, see <a
@@ -6014,9 +6119,9 @@ namespace Model
 
         /**
          * <p>Sets the status of an IAM user's SSH public key to active or inactive. SSH
-         * public keys that are inactive cannot be used for authentication. This action can
-         * be used to disable a user's SSH public key as part of a key rotation work
-         * flow.</p> <p>The SSH public key affected by this action is used only for
+         * public keys that are inactive cannot be used for authentication. This operation
+         * can be used to disable a user's SSH public key as part of a key rotation work
+         * flow.</p> <p>The SSH public key affected by this operation is used only for
          * authenticating the associated IAM user to an AWS CodeCommit repository. For more
          * information about using SSH keys to authenticate to an AWS CodeCommit
          * repository, see <a
@@ -6032,9 +6137,9 @@ namespace Model
 
         /**
          * <p>Sets the status of an IAM user's SSH public key to active or inactive. SSH
-         * public keys that are inactive cannot be used for authentication. This action can
-         * be used to disable a user's SSH public key as part of a key rotation work
-         * flow.</p> <p>The SSH public key affected by this action is used only for
+         * public keys that are inactive cannot be used for authentication. This operation
+         * can be used to disable a user's SSH public key as part of a key rotation work
+         * flow.</p> <p>The SSH public key affected by this operation is used only for
          * authenticating the associated IAM user to an AWS CodeCommit repository. For more
          * information about using SSH keys to authenticate to an AWS CodeCommit
          * repository, see <a
@@ -6050,21 +6155,23 @@ namespace Model
 
         /**
          * <p>Updates the name and/or the path of the specified server certificate stored
-         * in IAM.</p> <p>For more information about working with server certificates,
-         * including a list of AWS services that can use the server certificates that you
-         * manage with IAM, go to <a
+         * in IAM.</p> <p>For more information about working with server certificates, see
+         * <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html">Working
-         * with Server Certificates</a> in the <i>IAM User Guide</i>.</p> <important>
-         * <p>You should understand the implications of changing a server certificate's
-         * path or name. For more information, see <a
+         * with Server Certificates</a> in the <i>IAM User Guide</i>. This topic also
+         * includes a list of AWS services that can use the server certificates that you
+         * manage with IAM.</p> <important> <p>You should understand the implications of
+         * changing a server certificate's path or name. For more information, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs_manage.html#RenamingServerCerts">Renaming
          * a Server Certificate</a> in the <i>IAM User Guide</i>.</p> </important> <note>
-         * <p>To change a server certificate name the requester must have appropriate
-         * permissions on both the source object and the target object. For example, to
-         * change the name from "ProductionCert" to "ProdCert", the entity making the
-         * request must have permission on "ProductionCert" and "ProdCert", or must have
-         * permission on all (*). For more information about permissions, see <a
-         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/access.html">Access
+         * <p>The person making the request (the principal), must have permission to change
+         * the server certificate with the old name and the new name. For example, to
+         * change the certificate named <code>ProductionCert</code> to
+         * <code>ProdCert</code>, the principal must have a policy that allows them to
+         * update both certificates. If the principal has permission to update the
+         * <code>ProductionCert</code> group, but not the <code>ProdCert</code>
+         * certificate, then the update fails. For more information about permissions, see
+         * <a href="http://docs.aws.amazon.com/IAM/latest/UserGuide/access.html">Access
          * Management</a> in the <i>IAM User Guide</i>.</p> </note><p><h3>See Also:</h3>  
          * <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateServerCertificate">AWS
@@ -6074,21 +6181,23 @@ namespace Model
 
         /**
          * <p>Updates the name and/or the path of the specified server certificate stored
-         * in IAM.</p> <p>For more information about working with server certificates,
-         * including a list of AWS services that can use the server certificates that you
-         * manage with IAM, go to <a
+         * in IAM.</p> <p>For more information about working with server certificates, see
+         * <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html">Working
-         * with Server Certificates</a> in the <i>IAM User Guide</i>.</p> <important>
-         * <p>You should understand the implications of changing a server certificate's
-         * path or name. For more information, see <a
+         * with Server Certificates</a> in the <i>IAM User Guide</i>. This topic also
+         * includes a list of AWS services that can use the server certificates that you
+         * manage with IAM.</p> <important> <p>You should understand the implications of
+         * changing a server certificate's path or name. For more information, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs_manage.html#RenamingServerCerts">Renaming
          * a Server Certificate</a> in the <i>IAM User Guide</i>.</p> </important> <note>
-         * <p>To change a server certificate name the requester must have appropriate
-         * permissions on both the source object and the target object. For example, to
-         * change the name from "ProductionCert" to "ProdCert", the entity making the
-         * request must have permission on "ProductionCert" and "ProdCert", or must have
-         * permission on all (*). For more information about permissions, see <a
-         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/access.html">Access
+         * <p>The person making the request (the principal), must have permission to change
+         * the server certificate with the old name and the new name. For example, to
+         * change the certificate named <code>ProductionCert</code> to
+         * <code>ProdCert</code>, the principal must have a policy that allows them to
+         * update both certificates. If the principal has permission to update the
+         * <code>ProductionCert</code> group, but not the <code>ProdCert</code>
+         * certificate, then the update fails. For more information about permissions, see
+         * <a href="http://docs.aws.amazon.com/IAM/latest/UserGuide/access.html">Access
          * Management</a> in the <i>IAM User Guide</i>.</p> </note><p><h3>See Also:</h3>  
          * <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateServerCertificate">AWS
@@ -6100,21 +6209,23 @@ namespace Model
 
         /**
          * <p>Updates the name and/or the path of the specified server certificate stored
-         * in IAM.</p> <p>For more information about working with server certificates,
-         * including a list of AWS services that can use the server certificates that you
-         * manage with IAM, go to <a
+         * in IAM.</p> <p>For more information about working with server certificates, see
+         * <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html">Working
-         * with Server Certificates</a> in the <i>IAM User Guide</i>.</p> <important>
-         * <p>You should understand the implications of changing a server certificate's
-         * path or name. For more information, see <a
+         * with Server Certificates</a> in the <i>IAM User Guide</i>. This topic also
+         * includes a list of AWS services that can use the server certificates that you
+         * manage with IAM.</p> <important> <p>You should understand the implications of
+         * changing a server certificate's path or name. For more information, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs_manage.html#RenamingServerCerts">Renaming
          * a Server Certificate</a> in the <i>IAM User Guide</i>.</p> </important> <note>
-         * <p>To change a server certificate name the requester must have appropriate
-         * permissions on both the source object and the target object. For example, to
-         * change the name from "ProductionCert" to "ProdCert", the entity making the
-         * request must have permission on "ProductionCert" and "ProdCert", or must have
-         * permission on all (*). For more information about permissions, see <a
-         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/access.html">Access
+         * <p>The person making the request (the principal), must have permission to change
+         * the server certificate with the old name and the new name. For example, to
+         * change the certificate named <code>ProductionCert</code> to
+         * <code>ProdCert</code>, the principal must have a policy that allows them to
+         * update both certificates. If the principal has permission to update the
+         * <code>ProductionCert</code> group, but not the <code>ProdCert</code>
+         * certificate, then the update fails. For more information about permissions, see
+         * <a href="http://docs.aws.amazon.com/IAM/latest/UserGuide/access.html">Access
          * Management</a> in the <i>IAM User Guide</i>.</p> </note><p><h3>See Also:</h3>  
          * <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateServerCertificate">AWS
@@ -6127,7 +6238,7 @@ namespace Model
         /**
          * <p>Sets the status of a service-specific credential to <code>Active</code> or
          * <code>Inactive</code>. Service-specific credentials that are inactive cannot be
-         * used for authentication to the service. This action can be used to disable a
+         * used for authentication to the service. This operation can be used to disable a
          * user’s service-specific credential as part of a credential rotation work
          * flow.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateServiceSpecificCredential">AWS
@@ -6138,7 +6249,7 @@ namespace Model
         /**
          * <p>Sets the status of a service-specific credential to <code>Active</code> or
          * <code>Inactive</code>. Service-specific credentials that are inactive cannot be
-         * used for authentication to the service. This action can be used to disable a
+         * used for authentication to the service. This operation can be used to disable a
          * user’s service-specific credential as part of a credential rotation work
          * flow.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateServiceSpecificCredential">AWS
@@ -6151,7 +6262,7 @@ namespace Model
         /**
          * <p>Sets the status of a service-specific credential to <code>Active</code> or
          * <code>Inactive</code>. Service-specific credentials that are inactive cannot be
-         * used for authentication to the service. This action can be used to disable a
+         * used for authentication to the service. This operation can be used to disable a
          * user’s service-specific credential as part of a credential rotation work
          * flow.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateServiceSpecificCredential">AWS
@@ -6163,13 +6274,13 @@ namespace Model
 
         /**
          * <p>Changes the status of the specified user signing certificate from active to
-         * disabled, or vice versa. This action can be used to disable an IAM user's
+         * disabled, or vice versa. This operation can be used to disable an IAM user's
          * signing certificate as part of a certificate rotation work flow.</p> <p>If the
-         * <code>UserName</code> field is not specified, the UserName is determined
+         * <code>UserName</code> field is not specified, the user name is determined
          * implicitly based on the AWS access key ID used to sign the request. Because this
-         * action works for access keys under the AWS account, you can use this action to
-         * manage root credentials even if the AWS account has no associated
-         * users.</p><p><h3>See Also:</h3>   <a
+         * operation works for access keys under the AWS account, you can use this
+         * operation to manage AWS account root user credentials even if the AWS account
+         * has no associated users.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateSigningCertificate">AWS
          * API Reference</a></p>
          */
@@ -6177,13 +6288,13 @@ namespace Model
 
         /**
          * <p>Changes the status of the specified user signing certificate from active to
-         * disabled, or vice versa. This action can be used to disable an IAM user's
+         * disabled, or vice versa. This operation can be used to disable an IAM user's
          * signing certificate as part of a certificate rotation work flow.</p> <p>If the
-         * <code>UserName</code> field is not specified, the UserName is determined
+         * <code>UserName</code> field is not specified, the user name is determined
          * implicitly based on the AWS access key ID used to sign the request. Because this
-         * action works for access keys under the AWS account, you can use this action to
-         * manage root credentials even if the AWS account has no associated
-         * users.</p><p><h3>See Also:</h3>   <a
+         * operation works for access keys under the AWS account, you can use this
+         * operation to manage AWS account root user credentials even if the AWS account
+         * has no associated users.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateSigningCertificate">AWS
          * API Reference</a></p>
          *
@@ -6193,13 +6304,13 @@ namespace Model
 
         /**
          * <p>Changes the status of the specified user signing certificate from active to
-         * disabled, or vice versa. This action can be used to disable an IAM user's
+         * disabled, or vice versa. This operation can be used to disable an IAM user's
          * signing certificate as part of a certificate rotation work flow.</p> <p>If the
-         * <code>UserName</code> field is not specified, the UserName is determined
+         * <code>UserName</code> field is not specified, the user name is determined
          * implicitly based on the AWS access key ID used to sign the request. Because this
-         * action works for access keys under the AWS account, you can use this action to
-         * manage root credentials even if the AWS account has no associated
-         * users.</p><p><h3>See Also:</h3>   <a
+         * operation works for access keys under the AWS account, you can use this
+         * operation to manage AWS account root user credentials even if the AWS account
+         * has no associated users.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UpdateSigningCertificate">AWS
          * API Reference</a></p>
          *
@@ -6215,7 +6326,7 @@ namespace Model
          * an IAM User</a> and <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_groups_manage_rename.html">Renaming
          * an IAM Group</a> in the <i>IAM User Guide</i>.</p> </important> <note> <p> To
-         * change a user name the requester must have appropriate permissions on both the
+         * change a user name, the requester must have appropriate permissions on both the
          * source object and the target object. For example, to change Bob to Robert, the
          * entity making the request must have permission on Bob and Robert, or must have
          * permission on all (*). For more information about permissions, see <a
@@ -6234,7 +6345,7 @@ namespace Model
          * an IAM User</a> and <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_groups_manage_rename.html">Renaming
          * an IAM Group</a> in the <i>IAM User Guide</i>.</p> </important> <note> <p> To
-         * change a user name the requester must have appropriate permissions on both the
+         * change a user name, the requester must have appropriate permissions on both the
          * source object and the target object. For example, to change Bob to Robert, the
          * entity making the request must have permission on Bob and Robert, or must have
          * permission on all (*). For more information about permissions, see <a
@@ -6255,7 +6366,7 @@ namespace Model
          * an IAM User</a> and <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_groups_manage_rename.html">Renaming
          * an IAM Group</a> in the <i>IAM User Guide</i>.</p> </important> <note> <p> To
-         * change a user name the requester must have appropriate permissions on both the
+         * change a user name, the requester must have appropriate permissions on both the
          * source object and the target object. For example, to change Bob to Robert, the
          * entity making the request must have permission on Bob and Robert, or must have
          * permission on all (*). For more information about permissions, see <a
@@ -6270,7 +6381,7 @@ namespace Model
 
         /**
          * <p>Uploads an SSH public key and associates it with the specified IAM user.</p>
-         * <p>The SSH public key uploaded by this action can be used only for
+         * <p>The SSH public key uploaded by this operation can be used only for
          * authenticating the associated IAM user to an AWS CodeCommit repository. For more
          * information about using SSH keys to authenticate to an AWS CodeCommit
          * repository, see <a
@@ -6284,7 +6395,7 @@ namespace Model
 
         /**
          * <p>Uploads an SSH public key and associates it with the specified IAM user.</p>
-         * <p>The SSH public key uploaded by this action can be used only for
+         * <p>The SSH public key uploaded by this operation can be used only for
          * authenticating the associated IAM user to an AWS CodeCommit repository. For more
          * information about using SSH keys to authenticate to an AWS CodeCommit
          * repository, see <a
@@ -6300,7 +6411,7 @@ namespace Model
 
         /**
          * <p>Uploads an SSH public key and associates it with the specified IAM user.</p>
-         * <p>The SSH public key uploaded by this action can be used only for
+         * <p>The SSH public key uploaded by this operation can be used only for
          * authenticating the associated IAM user to an AWS CodeCommit repository. For more
          * information about using SSH keys to authenticate to an AWS CodeCommit
          * repository, see <a
@@ -6325,11 +6436,12 @@ namespace Model
          * provided by ACM are free. For more information about using ACM, see the <a
          * href="http://docs.aws.amazon.com/acm/latest/userguide/">AWS Certificate Manager
          * User Guide</a>.</p> <p>For more information about working with server
-         * certificates, including a list of AWS services that can use the server
-         * certificates that you manage with IAM, go to <a
+         * certificates, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html">Working
-         * with Server Certificates</a> in the <i>IAM User Guide</i>.</p> <p>For
-         * information about the number of server certificates you can upload, see <a
+         * with Server Certificates</a> in the <i>IAM User Guide</i>. This topic includes a
+         * list of AWS services that can use the server certificates that you manage with
+         * IAM.</p> <p>For information about the number of server certificates you can
+         * upload, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-limits.html">Limitations
          * on IAM Entities and Objects</a> in the <i>IAM User Guide</i>.</p> <note>
          * <p>Because the body of the public key certificate, private key, and the
@@ -6358,11 +6470,12 @@ namespace Model
          * provided by ACM are free. For more information about using ACM, see the <a
          * href="http://docs.aws.amazon.com/acm/latest/userguide/">AWS Certificate Manager
          * User Guide</a>.</p> <p>For more information about working with server
-         * certificates, including a list of AWS services that can use the server
-         * certificates that you manage with IAM, go to <a
+         * certificates, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html">Working
-         * with Server Certificates</a> in the <i>IAM User Guide</i>.</p> <p>For
-         * information about the number of server certificates you can upload, see <a
+         * with Server Certificates</a> in the <i>IAM User Guide</i>. This topic includes a
+         * list of AWS services that can use the server certificates that you manage with
+         * IAM.</p> <p>For information about the number of server certificates you can
+         * upload, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-limits.html">Limitations
          * on IAM Entities and Objects</a> in the <i>IAM User Guide</i>.</p> <note>
          * <p>Because the body of the public key certificate, private key, and the
@@ -6393,11 +6506,12 @@ namespace Model
          * provided by ACM are free. For more information about using ACM, see the <a
          * href="http://docs.aws.amazon.com/acm/latest/userguide/">AWS Certificate Manager
          * User Guide</a>.</p> <p>For more information about working with server
-         * certificates, including a list of AWS services that can use the server
-         * certificates that you manage with IAM, go to <a
+         * certificates, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html">Working
-         * with Server Certificates</a> in the <i>IAM User Guide</i>.</p> <p>For
-         * information about the number of server certificates you can upload, see <a
+         * with Server Certificates</a> in the <i>IAM User Guide</i>. This topic includes a
+         * list of AWS services that can use the server certificates that you manage with
+         * IAM.</p> <p>For information about the number of server certificates you can
+         * upload, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-limits.html">Limitations
          * on IAM Entities and Objects</a> in the <i>IAM User Guide</i>.</p> <note>
          * <p>Because the body of the public key certificate, private key, and the
@@ -6423,11 +6537,12 @@ namespace Model
          * are signed with a corresponding private key. When you upload the certificate,
          * its default status is <code>Active</code>.</p> <p>If the <code>UserName</code>
          * field is not specified, the IAM user name is determined implicitly based on the
-         * AWS access key ID used to sign the request. Because this action works for access
-         * keys under the AWS account, you can use this action to manage root credentials
-         * even if the AWS account has no associated users.</p> <note> <p>Because the body
-         * of a X.509 certificate can be large, you should use POST rather than GET when
-         * calling <code>UploadSigningCertificate</code>. For information about setting up
+         * AWS access key ID used to sign the request. Because this operation works for
+         * access keys under the AWS account, you can use this operation to manage AWS
+         * account root user credentials even if the AWS account has no associated
+         * users.</p> <note> <p>Because the body of an X.509 certificate can be large, you
+         * should use POST rather than GET when calling
+         * <code>UploadSigningCertificate</code>. For information about setting up
          * signatures and authorization through the API, go to <a
          * href="http://docs.aws.amazon.com/general/latest/gr/signing_aws_api_requests.html">Signing
          * AWS API Requests</a> in the <i>AWS General Reference</i>. For general
@@ -6446,11 +6561,12 @@ namespace Model
          * are signed with a corresponding private key. When you upload the certificate,
          * its default status is <code>Active</code>.</p> <p>If the <code>UserName</code>
          * field is not specified, the IAM user name is determined implicitly based on the
-         * AWS access key ID used to sign the request. Because this action works for access
-         * keys under the AWS account, you can use this action to manage root credentials
-         * even if the AWS account has no associated users.</p> <note> <p>Because the body
-         * of a X.509 certificate can be large, you should use POST rather than GET when
-         * calling <code>UploadSigningCertificate</code>. For information about setting up
+         * AWS access key ID used to sign the request. Because this operation works for
+         * access keys under the AWS account, you can use this operation to manage AWS
+         * account root user credentials even if the AWS account has no associated
+         * users.</p> <note> <p>Because the body of an X.509 certificate can be large, you
+         * should use POST rather than GET when calling
+         * <code>UploadSigningCertificate</code>. For information about setting up
          * signatures and authorization through the API, go to <a
          * href="http://docs.aws.amazon.com/general/latest/gr/signing_aws_api_requests.html">Signing
          * AWS API Requests</a> in the <i>AWS General Reference</i>. For general
@@ -6471,11 +6587,12 @@ namespace Model
          * are signed with a corresponding private key. When you upload the certificate,
          * its default status is <code>Active</code>.</p> <p>If the <code>UserName</code>
          * field is not specified, the IAM user name is determined implicitly based on the
-         * AWS access key ID used to sign the request. Because this action works for access
-         * keys under the AWS account, you can use this action to manage root credentials
-         * even if the AWS account has no associated users.</p> <note> <p>Because the body
-         * of a X.509 certificate can be large, you should use POST rather than GET when
-         * calling <code>UploadSigningCertificate</code>. For information about setting up
+         * AWS access key ID used to sign the request. Because this operation works for
+         * access keys under the AWS account, you can use this operation to manage AWS
+         * account root user credentials even if the AWS account has no associated
+         * users.</p> <note> <p>Because the body of an X.509 certificate can be large, you
+         * should use POST rather than GET when calling
+         * <code>UploadSigningCertificate</code>. For information about setting up
          * signatures and authorization through the API, go to <a
          * href="http://docs.aws.amazon.com/general/latest/gr/signing_aws_api_requests.html">Signing
          * AWS API Requests</a> in the <i>AWS General Reference</i>. For general
@@ -6607,6 +6724,7 @@ namespace Model
         void UpdateGroupAsyncHelper(const Model::UpdateGroupRequest& request, const UpdateGroupResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void UpdateLoginProfileAsyncHelper(const Model::UpdateLoginProfileRequest& request, const UpdateLoginProfileResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void UpdateOpenIDConnectProviderThumbprintAsyncHelper(const Model::UpdateOpenIDConnectProviderThumbprintRequest& request, const UpdateOpenIDConnectProviderThumbprintResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
+        void UpdateRoleAsyncHelper(const Model::UpdateRoleRequest& request, const UpdateRoleResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void UpdateRoleDescriptionAsyncHelper(const Model::UpdateRoleDescriptionRequest& request, const UpdateRoleDescriptionResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void UpdateSAMLProviderAsyncHelper(const Model::UpdateSAMLProviderRequest& request, const UpdateSAMLProviderResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void UpdateSSHPublicKeyAsyncHelper(const Model::UpdateSSHPublicKeyRequest& request, const UpdateSSHPublicKeyResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/AccessKey.h b/aws-cpp-sdk-iam/include/aws/iam/model/AccessKey.h
index b974a81a1a9..3eb17465695 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/AccessKey.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/AccessKey.h
@@ -38,10 +38,10 @@ namespace Model
   /**
    * <p>Contains information about an AWS access key.</p> <p> This data type is used
    * as a response element in the <a>CreateAccessKey</a> and <a>ListAccessKeys</a>
-   * actions. </p> <note> <p>The <code>SecretAccessKey</code> value is returned only
-   * in response to <a>CreateAccessKey</a>. You can get a secret access key only when
-   * you first create an access key; you cannot recover the secret access key later.
-   * If you lose a secret access key, you must create a new access key.</p>
+   * operations. </p> <note> <p>The <code>SecretAccessKey</code> value is returned
+   * only in response to <a>CreateAccessKey</a>. You can get a secret access key only
+   * when you first create an access key; you cannot recover the secret access key
+   * later. If you lose a secret access key, you must create a new access key.</p>
    * </note><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/AccessKey">AWS API
    * Reference</a></p>
@@ -130,32 +130,32 @@ namespace Model
 
 
     /**
-     * <p>The status of the access key. <code>Active</code> means the key is valid for
-     * API calls, while <code>Inactive</code> means it is not. </p>
+     * <p>The status of the access key. <code>Active</code> means that the key is valid
+     * for API calls, while <code>Inactive</code> means it is not. </p>
      */
     inline const StatusType& GetStatus() const{ return m_status; }
 
     /**
-     * <p>The status of the access key. <code>Active</code> means the key is valid for
-     * API calls, while <code>Inactive</code> means it is not. </p>
+     * <p>The status of the access key. <code>Active</code> means that the key is valid
+     * for API calls, while <code>Inactive</code> means it is not. </p>
      */
     inline void SetStatus(const StatusType& value) { m_statusHasBeenSet = true; m_status = value; }
 
     /**
-     * <p>The status of the access key. <code>Active</code> means the key is valid for
-     * API calls, while <code>Inactive</code> means it is not. </p>
+     * <p>The status of the access key. <code>Active</code> means that the key is valid
+     * for API calls, while <code>Inactive</code> means it is not. </p>
      */
     inline void SetStatus(StatusType&& value) { m_statusHasBeenSet = true; m_status = std::move(value); }
 
     /**
-     * <p>The status of the access key. <code>Active</code> means the key is valid for
-     * API calls, while <code>Inactive</code> means it is not. </p>
+     * <p>The status of the access key. <code>Active</code> means that the key is valid
+     * for API calls, while <code>Inactive</code> means it is not. </p>
      */
     inline AccessKey& WithStatus(const StatusType& value) { SetStatus(value); return *this;}
 
     /**
-     * <p>The status of the access key. <code>Active</code> means the key is valid for
-     * API calls, while <code>Inactive</code> means it is not. </p>
+     * <p>The status of the access key. <code>Active</code> means that the key is valid
+     * for API calls, while <code>Inactive</code> means it is not. </p>
      */
     inline AccessKey& WithStatus(StatusType&& value) { SetStatus(std::move(value)); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/AccessKeyLastUsed.h b/aws-cpp-sdk-iam/include/aws/iam/model/AccessKeyLastUsed.h
index 32eea58332a..52fb7a38ec2 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/AccessKeyLastUsed.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/AccessKeyLastUsed.h
@@ -37,7 +37,7 @@ namespace Model
   /**
    * <p>Contains information about the last time an AWS access key was used.</p>
    * <p>This data type is used as a response element in the
-   * <a>GetAccessKeyLastUsed</a> action.</p><p><h3>See Also:</h3>   <a
+   * <a>GetAccessKeyLastUsed</a> operation.</p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/AccessKeyLastUsed">AWS
    * API Reference</a></p>
    */
@@ -55,125 +55,132 @@ namespace Model
     /**
      * <p>The date and time, in <a href="http://www.iso.org/iso/iso8601">ISO 8601
      * date-time format</a>, when the access key was most recently used. This field is
-     * null when:</p> <ul> <li> <p>The user does not have an access key.</p> </li> <li>
-     * <p>An access key exists but has never been used, at least not since IAM started
-     * tracking this information on April 22nd, 2015.</p> </li> <li> <p>There is no
-     * sign-in data associated with the user</p> </li> </ul>
+     * null in the following situations:</p> <ul> <li> <p>The user does not have an
+     * access key.</p> </li> <li> <p>An access key exists but has never been used, at
+     * least not since IAM started tracking this information on April 22nd, 2015.</p>
+     * </li> <li> <p>There is no sign-in data associated with the user</p> </li> </ul>
      */
     inline const Aws::Utils::DateTime& GetLastUsedDate() const{ return m_lastUsedDate; }
 
     /**
      * <p>The date and time, in <a href="http://www.iso.org/iso/iso8601">ISO 8601
      * date-time format</a>, when the access key was most recently used. This field is
-     * null when:</p> <ul> <li> <p>The user does not have an access key.</p> </li> <li>
-     * <p>An access key exists but has never been used, at least not since IAM started
-     * tracking this information on April 22nd, 2015.</p> </li> <li> <p>There is no
-     * sign-in data associated with the user</p> </li> </ul>
+     * null in the following situations:</p> <ul> <li> <p>The user does not have an
+     * access key.</p> </li> <li> <p>An access key exists but has never been used, at
+     * least not since IAM started tracking this information on April 22nd, 2015.</p>
+     * </li> <li> <p>There is no sign-in data associated with the user</p> </li> </ul>
      */
     inline void SetLastUsedDate(const Aws::Utils::DateTime& value) { m_lastUsedDateHasBeenSet = true; m_lastUsedDate = value; }
 
     /**
      * <p>The date and time, in <a href="http://www.iso.org/iso/iso8601">ISO 8601
      * date-time format</a>, when the access key was most recently used. This field is
-     * null when:</p> <ul> <li> <p>The user does not have an access key.</p> </li> <li>
-     * <p>An access key exists but has never been used, at least not since IAM started
-     * tracking this information on April 22nd, 2015.</p> </li> <li> <p>There is no
-     * sign-in data associated with the user</p> </li> </ul>
+     * null in the following situations:</p> <ul> <li> <p>The user does not have an
+     * access key.</p> </li> <li> <p>An access key exists but has never been used, at
+     * least not since IAM started tracking this information on April 22nd, 2015.</p>
+     * </li> <li> <p>There is no sign-in data associated with the user</p> </li> </ul>
      */
     inline void SetLastUsedDate(Aws::Utils::DateTime&& value) { m_lastUsedDateHasBeenSet = true; m_lastUsedDate = std::move(value); }
 
     /**
      * <p>The date and time, in <a href="http://www.iso.org/iso/iso8601">ISO 8601
      * date-time format</a>, when the access key was most recently used. This field is
-     * null when:</p> <ul> <li> <p>The user does not have an access key.</p> </li> <li>
-     * <p>An access key exists but has never been used, at least not since IAM started
-     * tracking this information on April 22nd, 2015.</p> </li> <li> <p>There is no
-     * sign-in data associated with the user</p> </li> </ul>
+     * null in the following situations:</p> <ul> <li> <p>The user does not have an
+     * access key.</p> </li> <li> <p>An access key exists but has never been used, at
+     * least not since IAM started tracking this information on April 22nd, 2015.</p>
+     * </li> <li> <p>There is no sign-in data associated with the user</p> </li> </ul>
      */
     inline AccessKeyLastUsed& WithLastUsedDate(const Aws::Utils::DateTime& value) { SetLastUsedDate(value); return *this;}
 
     /**
      * <p>The date and time, in <a href="http://www.iso.org/iso/iso8601">ISO 8601
      * date-time format</a>, when the access key was most recently used. This field is
-     * null when:</p> <ul> <li> <p>The user does not have an access key.</p> </li> <li>
-     * <p>An access key exists but has never been used, at least not since IAM started
-     * tracking this information on April 22nd, 2015.</p> </li> <li> <p>There is no
-     * sign-in data associated with the user</p> </li> </ul>
+     * null in the following situations:</p> <ul> <li> <p>The user does not have an
+     * access key.</p> </li> <li> <p>An access key exists but has never been used, at
+     * least not since IAM started tracking this information on April 22nd, 2015.</p>
+     * </li> <li> <p>There is no sign-in data associated with the user</p> </li> </ul>
      */
     inline AccessKeyLastUsed& WithLastUsedDate(Aws::Utils::DateTime&& value) { SetLastUsedDate(std::move(value)); return *this;}
 
 
     /**
      * <p>The name of the AWS service with which this access key was most recently
-     * used. This field displays "N/A" when:</p> <ul> <li> <p>The user does not have an
-     * access key.</p> </li> <li> <p>An access key exists but has never been used, at
-     * least not since IAM started tracking this information on April 22nd, 2015.</p>
-     * </li> <li> <p>There is no sign-in data associated with the user</p> </li> </ul>
+     * used. This field displays "N/A" in the following situations:</p> <ul> <li>
+     * <p>The user does not have an access key.</p> </li> <li> <p>An access key exists
+     * but has never been used, at least not since IAM started tracking this
+     * information on April 22nd, 2015.</p> </li> <li> <p>There is no sign-in data
+     * associated with the user</p> </li> </ul>
      */
     inline const Aws::String& GetServiceName() const{ return m_serviceName; }
 
     /**
      * <p>The name of the AWS service with which this access key was most recently
-     * used. This field displays "N/A" when:</p> <ul> <li> <p>The user does not have an
-     * access key.</p> </li> <li> <p>An access key exists but has never been used, at
-     * least not since IAM started tracking this information on April 22nd, 2015.</p>
-     * </li> <li> <p>There is no sign-in data associated with the user</p> </li> </ul>
+     * used. This field displays "N/A" in the following situations:</p> <ul> <li>
+     * <p>The user does not have an access key.</p> </li> <li> <p>An access key exists
+     * but has never been used, at least not since IAM started tracking this
+     * information on April 22nd, 2015.</p> </li> <li> <p>There is no sign-in data
+     * associated with the user</p> </li> </ul>
      */
     inline void SetServiceName(const Aws::String& value) { m_serviceNameHasBeenSet = true; m_serviceName = value; }
 
     /**
      * <p>The name of the AWS service with which this access key was most recently
-     * used. This field displays "N/A" when:</p> <ul> <li> <p>The user does not have an
-     * access key.</p> </li> <li> <p>An access key exists but has never been used, at
-     * least not since IAM started tracking this information on April 22nd, 2015.</p>
-     * </li> <li> <p>There is no sign-in data associated with the user</p> </li> </ul>
+     * used. This field displays "N/A" in the following situations:</p> <ul> <li>
+     * <p>The user does not have an access key.</p> </li> <li> <p>An access key exists
+     * but has never been used, at least not since IAM started tracking this
+     * information on April 22nd, 2015.</p> </li> <li> <p>There is no sign-in data
+     * associated with the user</p> </li> </ul>
      */
     inline void SetServiceName(Aws::String&& value) { m_serviceNameHasBeenSet = true; m_serviceName = std::move(value); }
 
     /**
      * <p>The name of the AWS service with which this access key was most recently
-     * used. This field displays "N/A" when:</p> <ul> <li> <p>The user does not have an
-     * access key.</p> </li> <li> <p>An access key exists but has never been used, at
-     * least not since IAM started tracking this information on April 22nd, 2015.</p>
-     * </li> <li> <p>There is no sign-in data associated with the user</p> </li> </ul>
+     * used. This field displays "N/A" in the following situations:</p> <ul> <li>
+     * <p>The user does not have an access key.</p> </li> <li> <p>An access key exists
+     * but has never been used, at least not since IAM started tracking this
+     * information on April 22nd, 2015.</p> </li> <li> <p>There is no sign-in data
+     * associated with the user</p> </li> </ul>
      */
     inline void SetServiceName(const char* value) { m_serviceNameHasBeenSet = true; m_serviceName.assign(value); }
 
     /**
      * <p>The name of the AWS service with which this access key was most recently
-     * used. This field displays "N/A" when:</p> <ul> <li> <p>The user does not have an
-     * access key.</p> </li> <li> <p>An access key exists but has never been used, at
-     * least not since IAM started tracking this information on April 22nd, 2015.</p>
-     * </li> <li> <p>There is no sign-in data associated with the user</p> </li> </ul>
+     * used. This field displays "N/A" in the following situations:</p> <ul> <li>
+     * <p>The user does not have an access key.</p> </li> <li> <p>An access key exists
+     * but has never been used, at least not since IAM started tracking this
+     * information on April 22nd, 2015.</p> </li> <li> <p>There is no sign-in data
+     * associated with the user</p> </li> </ul>
      */
     inline AccessKeyLastUsed& WithServiceName(const Aws::String& value) { SetServiceName(value); return *this;}
 
     /**
      * <p>The name of the AWS service with which this access key was most recently
-     * used. This field displays "N/A" when:</p> <ul> <li> <p>The user does not have an
-     * access key.</p> </li> <li> <p>An access key exists but has never been used, at
-     * least not since IAM started tracking this information on April 22nd, 2015.</p>
-     * </li> <li> <p>There is no sign-in data associated with the user</p> </li> </ul>
+     * used. This field displays "N/A" in the following situations:</p> <ul> <li>
+     * <p>The user does not have an access key.</p> </li> <li> <p>An access key exists
+     * but has never been used, at least not since IAM started tracking this
+     * information on April 22nd, 2015.</p> </li> <li> <p>There is no sign-in data
+     * associated with the user</p> </li> </ul>
      */
     inline AccessKeyLastUsed& WithServiceName(Aws::String&& value) { SetServiceName(std::move(value)); return *this;}
 
     /**
      * <p>The name of the AWS service with which this access key was most recently
-     * used. This field displays "N/A" when:</p> <ul> <li> <p>The user does not have an
-     * access key.</p> </li> <li> <p>An access key exists but has never been used, at
-     * least not since IAM started tracking this information on April 22nd, 2015.</p>
-     * </li> <li> <p>There is no sign-in data associated with the user</p> </li> </ul>
+     * used. This field displays "N/A" in the following situations:</p> <ul> <li>
+     * <p>The user does not have an access key.</p> </li> <li> <p>An access key exists
+     * but has never been used, at least not since IAM started tracking this
+     * information on April 22nd, 2015.</p> </li> <li> <p>There is no sign-in data
+     * associated with the user</p> </li> </ul>
      */
     inline AccessKeyLastUsed& WithServiceName(const char* value) { SetServiceName(value); return *this;}
 
 
     /**
      * <p>The AWS region where this access key was most recently used. This field is
-     * displays "N/A" when:</p> <ul> <li> <p>The user does not have an access key.</p>
-     * </li> <li> <p>An access key exists but has never been used, at least not since
-     * IAM started tracking this information on April 22nd, 2015.</p> </li> <li>
-     * <p>There is no sign-in data associated with the user</p> </li> </ul> <p>For more
-     * information about AWS regions, see <a
+     * displays "N/A" in the following situations:</p> <ul> <li> <p>The user does not
+     * have an access key.</p> </li> <li> <p>An access key exists but has never been
+     * used, at least not since IAM started tracking this information on April 22nd,
+     * 2015.</p> </li> <li> <p>There is no sign-in data associated with the user</p>
+     * </li> </ul> <p>For more information about AWS regions, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/rande.html">Regions and
      * Endpoints</a> in the Amazon Web Services General Reference.</p>
      */
@@ -181,11 +188,11 @@ namespace Model
 
     /**
      * <p>The AWS region where this access key was most recently used. This field is
-     * displays "N/A" when:</p> <ul> <li> <p>The user does not have an access key.</p>
-     * </li> <li> <p>An access key exists but has never been used, at least not since
-     * IAM started tracking this information on April 22nd, 2015.</p> </li> <li>
-     * <p>There is no sign-in data associated with the user</p> </li> </ul> <p>For more
-     * information about AWS regions, see <a
+     * displays "N/A" in the following situations:</p> <ul> <li> <p>The user does not
+     * have an access key.</p> </li> <li> <p>An access key exists but has never been
+     * used, at least not since IAM started tracking this information on April 22nd,
+     * 2015.</p> </li> <li> <p>There is no sign-in data associated with the user</p>
+     * </li> </ul> <p>For more information about AWS regions, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/rande.html">Regions and
      * Endpoints</a> in the Amazon Web Services General Reference.</p>
      */
@@ -193,11 +200,11 @@ namespace Model
 
     /**
      * <p>The AWS region where this access key was most recently used. This field is
-     * displays "N/A" when:</p> <ul> <li> <p>The user does not have an access key.</p>
-     * </li> <li> <p>An access key exists but has never been used, at least not since
-     * IAM started tracking this information on April 22nd, 2015.</p> </li> <li>
-     * <p>There is no sign-in data associated with the user</p> </li> </ul> <p>For more
-     * information about AWS regions, see <a
+     * displays "N/A" in the following situations:</p> <ul> <li> <p>The user does not
+     * have an access key.</p> </li> <li> <p>An access key exists but has never been
+     * used, at least not since IAM started tracking this information on April 22nd,
+     * 2015.</p> </li> <li> <p>There is no sign-in data associated with the user</p>
+     * </li> </ul> <p>For more information about AWS regions, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/rande.html">Regions and
      * Endpoints</a> in the Amazon Web Services General Reference.</p>
      */
@@ -205,11 +212,11 @@ namespace Model
 
     /**
      * <p>The AWS region where this access key was most recently used. This field is
-     * displays "N/A" when:</p> <ul> <li> <p>The user does not have an access key.</p>
-     * </li> <li> <p>An access key exists but has never been used, at least not since
-     * IAM started tracking this information on April 22nd, 2015.</p> </li> <li>
-     * <p>There is no sign-in data associated with the user</p> </li> </ul> <p>For more
-     * information about AWS regions, see <a
+     * displays "N/A" in the following situations:</p> <ul> <li> <p>The user does not
+     * have an access key.</p> </li> <li> <p>An access key exists but has never been
+     * used, at least not since IAM started tracking this information on April 22nd,
+     * 2015.</p> </li> <li> <p>There is no sign-in data associated with the user</p>
+     * </li> </ul> <p>For more information about AWS regions, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/rande.html">Regions and
      * Endpoints</a> in the Amazon Web Services General Reference.</p>
      */
@@ -217,11 +224,11 @@ namespace Model
 
     /**
      * <p>The AWS region where this access key was most recently used. This field is
-     * displays "N/A" when:</p> <ul> <li> <p>The user does not have an access key.</p>
-     * </li> <li> <p>An access key exists but has never been used, at least not since
-     * IAM started tracking this information on April 22nd, 2015.</p> </li> <li>
-     * <p>There is no sign-in data associated with the user</p> </li> </ul> <p>For more
-     * information about AWS regions, see <a
+     * displays "N/A" in the following situations:</p> <ul> <li> <p>The user does not
+     * have an access key.</p> </li> <li> <p>An access key exists but has never been
+     * used, at least not since IAM started tracking this information on April 22nd,
+     * 2015.</p> </li> <li> <p>There is no sign-in data associated with the user</p>
+     * </li> </ul> <p>For more information about AWS regions, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/rande.html">Regions and
      * Endpoints</a> in the Amazon Web Services General Reference.</p>
      */
@@ -229,11 +236,11 @@ namespace Model
 
     /**
      * <p>The AWS region where this access key was most recently used. This field is
-     * displays "N/A" when:</p> <ul> <li> <p>The user does not have an access key.</p>
-     * </li> <li> <p>An access key exists but has never been used, at least not since
-     * IAM started tracking this information on April 22nd, 2015.</p> </li> <li>
-     * <p>There is no sign-in data associated with the user</p> </li> </ul> <p>For more
-     * information about AWS regions, see <a
+     * displays "N/A" in the following situations:</p> <ul> <li> <p>The user does not
+     * have an access key.</p> </li> <li> <p>An access key exists but has never been
+     * used, at least not since IAM started tracking this information on April 22nd,
+     * 2015.</p> </li> <li> <p>There is no sign-in data associated with the user</p>
+     * </li> </ul> <p>For more information about AWS regions, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/rande.html">Regions and
      * Endpoints</a> in the Amazon Web Services General Reference.</p>
      */
@@ -241,11 +248,11 @@ namespace Model
 
     /**
      * <p>The AWS region where this access key was most recently used. This field is
-     * displays "N/A" when:</p> <ul> <li> <p>The user does not have an access key.</p>
-     * </li> <li> <p>An access key exists but has never been used, at least not since
-     * IAM started tracking this information on April 22nd, 2015.</p> </li> <li>
-     * <p>There is no sign-in data associated with the user</p> </li> </ul> <p>For more
-     * information about AWS regions, see <a
+     * displays "N/A" in the following situations:</p> <ul> <li> <p>The user does not
+     * have an access key.</p> </li> <li> <p>An access key exists but has never been
+     * used, at least not since IAM started tracking this information on April 22nd,
+     * 2015.</p> </li> <li> <p>There is no sign-in data associated with the user</p>
+     * </li> </ul> <p>For more information about AWS regions, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/rande.html">Regions and
      * Endpoints</a> in the Amazon Web Services General Reference.</p>
      */
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/AccessKeyMetadata.h b/aws-cpp-sdk-iam/include/aws/iam/model/AccessKeyMetadata.h
index 0c64f0fc586..f7163500889 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/AccessKeyMetadata.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/AccessKeyMetadata.h
@@ -38,7 +38,7 @@ namespace Model
   /**
    * <p>Contains information about an AWS access key, without its secret key.</p>
    * <p>This data type is used as a response element in the <a>ListAccessKeys</a>
-   * action.</p><p><h3>See Also:</h3>   <a
+   * operation.</p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/AccessKeyMetadata">AWS
    * API Reference</a></p>
    */
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/AddClientIDToOpenIDConnectProviderRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/AddClientIDToOpenIDConnectProviderRequest.h
index 6f4c68511c3..dd4f483109d 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/AddClientIDToOpenIDConnectProviderRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/AddClientIDToOpenIDConnectProviderRequest.h
@@ -49,49 +49,49 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OpenID Connect (OIDC) provider
      * resource to add the client ID to. You can get a list of OIDC provider ARNs by
-     * using the <a>ListOpenIDConnectProviders</a> action.</p>
+     * using the <a>ListOpenIDConnectProviders</a> operation.</p>
      */
     inline const Aws::String& GetOpenIDConnectProviderArn() const{ return m_openIDConnectProviderArn; }
 
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OpenID Connect (OIDC) provider
      * resource to add the client ID to. You can get a list of OIDC provider ARNs by
-     * using the <a>ListOpenIDConnectProviders</a> action.</p>
+     * using the <a>ListOpenIDConnectProviders</a> operation.</p>
      */
     inline void SetOpenIDConnectProviderArn(const Aws::String& value) { m_openIDConnectProviderArnHasBeenSet = true; m_openIDConnectProviderArn = value; }
 
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OpenID Connect (OIDC) provider
      * resource to add the client ID to. You can get a list of OIDC provider ARNs by
-     * using the <a>ListOpenIDConnectProviders</a> action.</p>
+     * using the <a>ListOpenIDConnectProviders</a> operation.</p>
      */
     inline void SetOpenIDConnectProviderArn(Aws::String&& value) { m_openIDConnectProviderArnHasBeenSet = true; m_openIDConnectProviderArn = std::move(value); }
 
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OpenID Connect (OIDC) provider
      * resource to add the client ID to. You can get a list of OIDC provider ARNs by
-     * using the <a>ListOpenIDConnectProviders</a> action.</p>
+     * using the <a>ListOpenIDConnectProviders</a> operation.</p>
      */
     inline void SetOpenIDConnectProviderArn(const char* value) { m_openIDConnectProviderArnHasBeenSet = true; m_openIDConnectProviderArn.assign(value); }
 
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OpenID Connect (OIDC) provider
      * resource to add the client ID to. You can get a list of OIDC provider ARNs by
-     * using the <a>ListOpenIDConnectProviders</a> action.</p>
+     * using the <a>ListOpenIDConnectProviders</a> operation.</p>
      */
     inline AddClientIDToOpenIDConnectProviderRequest& WithOpenIDConnectProviderArn(const Aws::String& value) { SetOpenIDConnectProviderArn(value); return *this;}
 
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OpenID Connect (OIDC) provider
      * resource to add the client ID to. You can get a list of OIDC provider ARNs by
-     * using the <a>ListOpenIDConnectProviders</a> action.</p>
+     * using the <a>ListOpenIDConnectProviders</a> operation.</p>
      */
     inline AddClientIDToOpenIDConnectProviderRequest& WithOpenIDConnectProviderArn(Aws::String&& value) { SetOpenIDConnectProviderArn(std::move(value)); return *this;}
 
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OpenID Connect (OIDC) provider
      * resource to add the client ID to. You can get a list of OIDC provider ARNs by
-     * using the <a>ListOpenIDConnectProviders</a> action.</p>
+     * using the <a>ListOpenIDConnectProviders</a> operation.</p>
      */
     inline AddClientIDToOpenIDConnectProviderRequest& WithOpenIDConnectProviderArn(const char* value) { SetOpenIDConnectProviderArn(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/AddRoleToInstanceProfileRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/AddRoleToInstanceProfileRequest.h
index 6da86c06f41..bf80b1c9585 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/AddRoleToInstanceProfileRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/AddRoleToInstanceProfileRequest.h
@@ -50,7 +50,7 @@ namespace Model
      * <p>The name of the instance profile to update.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetInstanceProfileName() const{ return m_instanceProfileName; }
 
@@ -58,7 +58,7 @@ namespace Model
      * <p>The name of the instance profile to update.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetInstanceProfileName(const Aws::String& value) { m_instanceProfileNameHasBeenSet = true; m_instanceProfileName = value; }
 
@@ -66,7 +66,7 @@ namespace Model
      * <p>The name of the instance profile to update.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetInstanceProfileName(Aws::String&& value) { m_instanceProfileNameHasBeenSet = true; m_instanceProfileName = std::move(value); }
 
@@ -74,7 +74,7 @@ namespace Model
      * <p>The name of the instance profile to update.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetInstanceProfileName(const char* value) { m_instanceProfileNameHasBeenSet = true; m_instanceProfileName.assign(value); }
 
@@ -82,7 +82,7 @@ namespace Model
      * <p>The name of the instance profile to update.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline AddRoleToInstanceProfileRequest& WithInstanceProfileName(const Aws::String& value) { SetInstanceProfileName(value); return *this;}
 
@@ -90,7 +90,7 @@ namespace Model
      * <p>The name of the instance profile to update.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline AddRoleToInstanceProfileRequest& WithInstanceProfileName(Aws::String&& value) { SetInstanceProfileName(std::move(value)); return *this;}
 
@@ -98,7 +98,7 @@ namespace Model
      * <p>The name of the instance profile to update.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline AddRoleToInstanceProfileRequest& WithInstanceProfileName(const char* value) { SetInstanceProfileName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/AddUserToGroupRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/AddUserToGroupRequest.h
index 9fd5824fcae..21acab12cb6 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/AddUserToGroupRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/AddUserToGroupRequest.h
@@ -50,7 +50,7 @@ namespace Model
      * <p>The name of the group to update.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetGroupName() const{ return m_groupName; }
 
@@ -58,7 +58,7 @@ namespace Model
      * <p>The name of the group to update.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const Aws::String& value) { m_groupNameHasBeenSet = true; m_groupName = value; }
 
@@ -66,7 +66,7 @@ namespace Model
      * <p>The name of the group to update.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(Aws::String&& value) { m_groupNameHasBeenSet = true; m_groupName = std::move(value); }
 
@@ -74,7 +74,7 @@ namespace Model
      * <p>The name of the group to update.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const char* value) { m_groupNameHasBeenSet = true; m_groupName.assign(value); }
 
@@ -82,7 +82,7 @@ namespace Model
      * <p>The name of the group to update.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline AddUserToGroupRequest& WithGroupName(const Aws::String& value) { SetGroupName(value); return *this;}
 
@@ -90,7 +90,7 @@ namespace Model
      * <p>The name of the group to update.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline AddUserToGroupRequest& WithGroupName(Aws::String&& value) { SetGroupName(std::move(value)); return *this;}
 
@@ -98,7 +98,7 @@ namespace Model
      * <p>The name of the group to update.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline AddUserToGroupRequest& WithGroupName(const char* value) { SetGroupName(value); return *this;}
 
@@ -107,7 +107,7 @@ namespace Model
      * <p>The name of the user to add.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -115,7 +115,7 @@ namespace Model
      * <p>The name of the user to add.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -123,7 +123,7 @@ namespace Model
      * <p>The name of the user to add.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -131,7 +131,7 @@ namespace Model
      * <p>The name of the user to add.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -139,7 +139,7 @@ namespace Model
      * <p>The name of the user to add.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline AddUserToGroupRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -147,7 +147,7 @@ namespace Model
      * <p>The name of the user to add.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline AddUserToGroupRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -155,7 +155,7 @@ namespace Model
      * <p>The name of the user to add.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline AddUserToGroupRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/AttachGroupPolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/AttachGroupPolicyRequest.h
index 45bb09b240e..d8cac5170d9 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/AttachGroupPolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/AttachGroupPolicyRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetGroupName() const{ return m_groupName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const Aws::String& value) { m_groupNameHasBeenSet = true; m_groupName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(Aws::String&& value) { m_groupNameHasBeenSet = true; m_groupName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const char* value) { m_groupNameHasBeenSet = true; m_groupName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline AttachGroupPolicyRequest& WithGroupName(const Aws::String& value) { SetGroupName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline AttachGroupPolicyRequest& WithGroupName(Aws::String&& value) { SetGroupName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline AttachGroupPolicyRequest& WithGroupName(const char* value) { SetGroupName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/AttachUserPolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/AttachUserPolicyRequest.h
index d7da06d439c..445b4e8eff7 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/AttachUserPolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/AttachUserPolicyRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * to.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * to.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * to.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * to.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * to.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline AttachUserPolicyRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * to.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline AttachUserPolicyRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * to.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline AttachUserPolicyRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/AttachedPolicy.h b/aws-cpp-sdk-iam/include/aws/iam/model/AttachedPolicy.h
index 10fa2f0fd8b..ac52bba6e5a 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/AttachedPolicy.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/AttachedPolicy.h
@@ -38,7 +38,7 @@ namespace Model
    * managed policy that has been attached to a user, group, or role. This data type
    * is used as a response element in the <a>ListAttachedGroupPolicies</a>,
    * <a>ListAttachedRolePolicies</a>, <a>ListAttachedUserPolicies</a>, and
-   * <a>GetAccountAuthorizationDetails</a> actions. </p> <p>For more information
+   * <a>GetAccountAuthorizationDetails</a> operations. </p> <p>For more information
    * about managed policies, refer to <a
    * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html">Managed
    * Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p><p><h3>See
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ChangePasswordRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ChangePasswordRequest.h
index 73f390048a5..77854dd5b46 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ChangePasswordRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ChangePasswordRequest.h
@@ -85,98 +85,98 @@ namespace Model
     /**
      * <p>The new password. The new password must conform to the AWS account's password
      * policy, if one exists.</p> <p>The <a
-     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of almost any printable ASCII
-     * character from the space (\u0020) through the end of the ASCII character range
-     * (\u00FF). You can also include the tab (\u0009), line feed (\u000A), and
-     * carriage return (\u000D) characters. Although any of these characters are valid
-     * in a password, note that many tools, such as the AWS Management Console, might
-     * restrict the ability to enter certain characters because they have special
-     * meaning within that tool.</p>
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> that is used to
+     * validate this parameter is a string of characters. That string can include
+     * almost any printable ASCII character from the space (\u0020) through the end of
+     * the ASCII character range (\u00FF). You can also include the tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D) characters. Any of these characters
+     * are valid in a password. However, many tools, such as the AWS Management
+     * Console, might restrict the ability to type certain characters because they have
+     * special meaning within that tool.</p>
      */
     inline const Aws::String& GetNewPassword() const{ return m_newPassword; }
 
     /**
      * <p>The new password. The new password must conform to the AWS account's password
      * policy, if one exists.</p> <p>The <a
-     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of almost any printable ASCII
-     * character from the space (\u0020) through the end of the ASCII character range
-     * (\u00FF). You can also include the tab (\u0009), line feed (\u000A), and
-     * carriage return (\u000D) characters. Although any of these characters are valid
-     * in a password, note that many tools, such as the AWS Management Console, might
-     * restrict the ability to enter certain characters because they have special
-     * meaning within that tool.</p>
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> that is used to
+     * validate this parameter is a string of characters. That string can include
+     * almost any printable ASCII character from the space (\u0020) through the end of
+     * the ASCII character range (\u00FF). You can also include the tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D) characters. Any of these characters
+     * are valid in a password. However, many tools, such as the AWS Management
+     * Console, might restrict the ability to type certain characters because they have
+     * special meaning within that tool.</p>
      */
     inline void SetNewPassword(const Aws::String& value) { m_newPasswordHasBeenSet = true; m_newPassword = value; }
 
     /**
      * <p>The new password. The new password must conform to the AWS account's password
      * policy, if one exists.</p> <p>The <a
-     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of almost any printable ASCII
-     * character from the space (\u0020) through the end of the ASCII character range
-     * (\u00FF). You can also include the tab (\u0009), line feed (\u000A), and
-     * carriage return (\u000D) characters. Although any of these characters are valid
-     * in a password, note that many tools, such as the AWS Management Console, might
-     * restrict the ability to enter certain characters because they have special
-     * meaning within that tool.</p>
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> that is used to
+     * validate this parameter is a string of characters. That string can include
+     * almost any printable ASCII character from the space (\u0020) through the end of
+     * the ASCII character range (\u00FF). You can also include the tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D) characters. Any of these characters
+     * are valid in a password. However, many tools, such as the AWS Management
+     * Console, might restrict the ability to type certain characters because they have
+     * special meaning within that tool.</p>
      */
     inline void SetNewPassword(Aws::String&& value) { m_newPasswordHasBeenSet = true; m_newPassword = std::move(value); }
 
     /**
      * <p>The new password. The new password must conform to the AWS account's password
      * policy, if one exists.</p> <p>The <a
-     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of almost any printable ASCII
-     * character from the space (\u0020) through the end of the ASCII character range
-     * (\u00FF). You can also include the tab (\u0009), line feed (\u000A), and
-     * carriage return (\u000D) characters. Although any of these characters are valid
-     * in a password, note that many tools, such as the AWS Management Console, might
-     * restrict the ability to enter certain characters because they have special
-     * meaning within that tool.</p>
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> that is used to
+     * validate this parameter is a string of characters. That string can include
+     * almost any printable ASCII character from the space (\u0020) through the end of
+     * the ASCII character range (\u00FF). You can also include the tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D) characters. Any of these characters
+     * are valid in a password. However, many tools, such as the AWS Management
+     * Console, might restrict the ability to type certain characters because they have
+     * special meaning within that tool.</p>
      */
     inline void SetNewPassword(const char* value) { m_newPasswordHasBeenSet = true; m_newPassword.assign(value); }
 
     /**
      * <p>The new password. The new password must conform to the AWS account's password
      * policy, if one exists.</p> <p>The <a
-     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of almost any printable ASCII
-     * character from the space (\u0020) through the end of the ASCII character range
-     * (\u00FF). You can also include the tab (\u0009), line feed (\u000A), and
-     * carriage return (\u000D) characters. Although any of these characters are valid
-     * in a password, note that many tools, such as the AWS Management Console, might
-     * restrict the ability to enter certain characters because they have special
-     * meaning within that tool.</p>
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> that is used to
+     * validate this parameter is a string of characters. That string can include
+     * almost any printable ASCII character from the space (\u0020) through the end of
+     * the ASCII character range (\u00FF). You can also include the tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D) characters. Any of these characters
+     * are valid in a password. However, many tools, such as the AWS Management
+     * Console, might restrict the ability to type certain characters because they have
+     * special meaning within that tool.</p>
      */
     inline ChangePasswordRequest& WithNewPassword(const Aws::String& value) { SetNewPassword(value); return *this;}
 
     /**
      * <p>The new password. The new password must conform to the AWS account's password
      * policy, if one exists.</p> <p>The <a
-     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of almost any printable ASCII
-     * character from the space (\u0020) through the end of the ASCII character range
-     * (\u00FF). You can also include the tab (\u0009), line feed (\u000A), and
-     * carriage return (\u000D) characters. Although any of these characters are valid
-     * in a password, note that many tools, such as the AWS Management Console, might
-     * restrict the ability to enter certain characters because they have special
-     * meaning within that tool.</p>
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> that is used to
+     * validate this parameter is a string of characters. That string can include
+     * almost any printable ASCII character from the space (\u0020) through the end of
+     * the ASCII character range (\u00FF). You can also include the tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D) characters. Any of these characters
+     * are valid in a password. However, many tools, such as the AWS Management
+     * Console, might restrict the ability to type certain characters because they have
+     * special meaning within that tool.</p>
      */
     inline ChangePasswordRequest& WithNewPassword(Aws::String&& value) { SetNewPassword(std::move(value)); return *this;}
 
     /**
      * <p>The new password. The new password must conform to the AWS account's password
      * policy, if one exists.</p> <p>The <a
-     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of almost any printable ASCII
-     * character from the space (\u0020) through the end of the ASCII character range
-     * (\u00FF). You can also include the tab (\u0009), line feed (\u000A), and
-     * carriage return (\u000D) characters. Although any of these characters are valid
-     * in a password, note that many tools, such as the AWS Management Console, might
-     * restrict the ability to enter certain characters because they have special
-     * meaning within that tool.</p>
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> that is used to
+     * validate this parameter is a string of characters. That string can include
+     * almost any printable ASCII character from the space (\u0020) through the end of
+     * the ASCII character range (\u00FF). You can also include the tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D) characters. Any of these characters
+     * are valid in a password. However, many tools, such as the AWS Management
+     * Console, might restrict the ability to type certain characters because they have
+     * special meaning within that tool.</p>
      */
     inline ChangePasswordRequest& WithNewPassword(const char* value) { SetNewPassword(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ContextEntry.h b/aws-cpp-sdk-iam/include/aws/iam/model/ContextEntry.h
index ddf7223adb2..9f86b18868e 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ContextEntry.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ContextEntry.h
@@ -101,56 +101,56 @@ namespace Model
 
     /**
      * <p>The value (or values, if the condition context key supports multiple values)
-     * to provide to the simulation for use when the key is referenced by a
+     * to provide to the simulation when the key is referenced by a
      * <code>Condition</code> element in an input policy.</p>
      */
     inline const Aws::Vector<Aws::String>& GetContextKeyValues() const{ return m_contextKeyValues; }
 
     /**
      * <p>The value (or values, if the condition context key supports multiple values)
-     * to provide to the simulation for use when the key is referenced by a
+     * to provide to the simulation when the key is referenced by a
      * <code>Condition</code> element in an input policy.</p>
      */
     inline void SetContextKeyValues(const Aws::Vector<Aws::String>& value) { m_contextKeyValuesHasBeenSet = true; m_contextKeyValues = value; }
 
     /**
      * <p>The value (or values, if the condition context key supports multiple values)
-     * to provide to the simulation for use when the key is referenced by a
+     * to provide to the simulation when the key is referenced by a
      * <code>Condition</code> element in an input policy.</p>
      */
     inline void SetContextKeyValues(Aws::Vector<Aws::String>&& value) { m_contextKeyValuesHasBeenSet = true; m_contextKeyValues = std::move(value); }
 
     /**
      * <p>The value (or values, if the condition context key supports multiple values)
-     * to provide to the simulation for use when the key is referenced by a
+     * to provide to the simulation when the key is referenced by a
      * <code>Condition</code> element in an input policy.</p>
      */
     inline ContextEntry& WithContextKeyValues(const Aws::Vector<Aws::String>& value) { SetContextKeyValues(value); return *this;}
 
     /**
      * <p>The value (or values, if the condition context key supports multiple values)
-     * to provide to the simulation for use when the key is referenced by a
+     * to provide to the simulation when the key is referenced by a
      * <code>Condition</code> element in an input policy.</p>
      */
     inline ContextEntry& WithContextKeyValues(Aws::Vector<Aws::String>&& value) { SetContextKeyValues(std::move(value)); return *this;}
 
     /**
      * <p>The value (or values, if the condition context key supports multiple values)
-     * to provide to the simulation for use when the key is referenced by a
+     * to provide to the simulation when the key is referenced by a
      * <code>Condition</code> element in an input policy.</p>
      */
     inline ContextEntry& AddContextKeyValues(const Aws::String& value) { m_contextKeyValuesHasBeenSet = true; m_contextKeyValues.push_back(value); return *this; }
 
     /**
      * <p>The value (or values, if the condition context key supports multiple values)
-     * to provide to the simulation for use when the key is referenced by a
+     * to provide to the simulation when the key is referenced by a
      * <code>Condition</code> element in an input policy.</p>
      */
     inline ContextEntry& AddContextKeyValues(Aws::String&& value) { m_contextKeyValuesHasBeenSet = true; m_contextKeyValues.push_back(std::move(value)); return *this; }
 
     /**
      * <p>The value (or values, if the condition context key supports multiple values)
-     * to provide to the simulation for use when the key is referenced by a
+     * to provide to the simulation when the key is referenced by a
      * <code>Condition</code> element in an input policy.</p>
      */
     inline ContextEntry& AddContextKeyValues(const char* value) { m_contextKeyValuesHasBeenSet = true; m_contextKeyValues.push_back(value); return *this; }
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/CreateAccessKeyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/CreateAccessKeyRequest.h
index 66dc5d6a10d..d49ec420d8a 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/CreateAccessKeyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/CreateAccessKeyRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline CreateAccessKeyRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline CreateAccessKeyRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline CreateAccessKeyRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/CreateGroupRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/CreateGroupRequest.h
index bb45a31adfc..a87d9804ab4 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/CreateGroupRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/CreateGroupRequest.h
@@ -50,12 +50,13 @@ namespace Model
      * <p> The path to the group. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline const Aws::String& GetPath() const{ return m_path; }
 
@@ -63,12 +64,13 @@ namespace Model
      * <p> The path to the group. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline void SetPath(const Aws::String& value) { m_pathHasBeenSet = true; m_path = value; }
 
@@ -76,12 +78,13 @@ namespace Model
      * <p> The path to the group. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline void SetPath(Aws::String&& value) { m_pathHasBeenSet = true; m_path = std::move(value); }
 
@@ -89,12 +92,13 @@ namespace Model
      * <p> The path to the group. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline void SetPath(const char* value) { m_pathHasBeenSet = true; m_path.assign(value); }
 
@@ -102,12 +106,13 @@ namespace Model
      * <p> The path to the group. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline CreateGroupRequest& WithPath(const Aws::String& value) { SetPath(value); return *this;}
 
@@ -115,12 +120,13 @@ namespace Model
      * <p> The path to the group. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline CreateGroupRequest& WithPath(Aws::String&& value) { SetPath(std::move(value)); return *this;}
 
@@ -128,12 +134,13 @@ namespace Model
      * <p> The path to the group. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline CreateGroupRequest& WithPath(const char* value) { SetPath(value); return *this;}
 
@@ -143,8 +150,8 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-. The group name must be
-     * unique within the account. Group names are not distinguished by case. For
+     * can also include any of the following characters: _+=,.@-. The group name must
+     * be unique within the account. Group names are not distinguished by case. For
      * example, you cannot create groups named both "ADMINS" and "admins".</p>
      */
     inline const Aws::String& GetGroupName() const{ return m_groupName; }
@@ -154,8 +161,8 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-. The group name must be
-     * unique within the account. Group names are not distinguished by case. For
+     * can also include any of the following characters: _+=,.@-. The group name must
+     * be unique within the account. Group names are not distinguished by case. For
      * example, you cannot create groups named both "ADMINS" and "admins".</p>
      */
     inline void SetGroupName(const Aws::String& value) { m_groupNameHasBeenSet = true; m_groupName = value; }
@@ -165,8 +172,8 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-. The group name must be
-     * unique within the account. Group names are not distinguished by case. For
+     * can also include any of the following characters: _+=,.@-. The group name must
+     * be unique within the account. Group names are not distinguished by case. For
      * example, you cannot create groups named both "ADMINS" and "admins".</p>
      */
     inline void SetGroupName(Aws::String&& value) { m_groupNameHasBeenSet = true; m_groupName = std::move(value); }
@@ -176,8 +183,8 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-. The group name must be
-     * unique within the account. Group names are not distinguished by case. For
+     * can also include any of the following characters: _+=,.@-. The group name must
+     * be unique within the account. Group names are not distinguished by case. For
      * example, you cannot create groups named both "ADMINS" and "admins".</p>
      */
     inline void SetGroupName(const char* value) { m_groupNameHasBeenSet = true; m_groupName.assign(value); }
@@ -187,8 +194,8 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-. The group name must be
-     * unique within the account. Group names are not distinguished by case. For
+     * can also include any of the following characters: _+=,.@-. The group name must
+     * be unique within the account. Group names are not distinguished by case. For
      * example, you cannot create groups named both "ADMINS" and "admins".</p>
      */
     inline CreateGroupRequest& WithGroupName(const Aws::String& value) { SetGroupName(value); return *this;}
@@ -198,8 +205,8 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-. The group name must be
-     * unique within the account. Group names are not distinguished by case. For
+     * can also include any of the following characters: _+=,.@-. The group name must
+     * be unique within the account. Group names are not distinguished by case. For
      * example, you cannot create groups named both "ADMINS" and "admins".</p>
      */
     inline CreateGroupRequest& WithGroupName(Aws::String&& value) { SetGroupName(std::move(value)); return *this;}
@@ -209,8 +216,8 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-. The group name must be
-     * unique within the account. Group names are not distinguished by case. For
+     * can also include any of the following characters: _+=,.@-. The group name must
+     * be unique within the account. Group names are not distinguished by case. For
      * example, you cannot create groups named both "ADMINS" and "admins".</p>
      */
     inline CreateGroupRequest& WithGroupName(const char* value) { SetGroupName(value); return *this;}
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/CreateInstanceProfileRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/CreateInstanceProfileRequest.h
index 557a5da4538..05db621bc39 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/CreateInstanceProfileRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/CreateInstanceProfileRequest.h
@@ -50,7 +50,7 @@ namespace Model
      * <p>The name of the instance profile to create.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetInstanceProfileName() const{ return m_instanceProfileName; }
 
@@ -58,7 +58,7 @@ namespace Model
      * <p>The name of the instance profile to create.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetInstanceProfileName(const Aws::String& value) { m_instanceProfileNameHasBeenSet = true; m_instanceProfileName = value; }
 
@@ -66,7 +66,7 @@ namespace Model
      * <p>The name of the instance profile to create.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetInstanceProfileName(Aws::String&& value) { m_instanceProfileNameHasBeenSet = true; m_instanceProfileName = std::move(value); }
 
@@ -74,7 +74,7 @@ namespace Model
      * <p>The name of the instance profile to create.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetInstanceProfileName(const char* value) { m_instanceProfileNameHasBeenSet = true; m_instanceProfileName.assign(value); }
 
@@ -82,7 +82,7 @@ namespace Model
      * <p>The name of the instance profile to create.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline CreateInstanceProfileRequest& WithInstanceProfileName(const Aws::String& value) { SetInstanceProfileName(value); return *this;}
 
@@ -90,7 +90,7 @@ namespace Model
      * <p>The name of the instance profile to create.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline CreateInstanceProfileRequest& WithInstanceProfileName(Aws::String&& value) { SetInstanceProfileName(std::move(value)); return *this;}
 
@@ -98,7 +98,7 @@ namespace Model
      * <p>The name of the instance profile to create.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline CreateInstanceProfileRequest& WithInstanceProfileName(const char* value) { SetInstanceProfileName(value); return *this;}
 
@@ -107,12 +107,13 @@ namespace Model
      * <p> The path to the instance profile. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline const Aws::String& GetPath() const{ return m_path; }
 
@@ -120,12 +121,13 @@ namespace Model
      * <p> The path to the instance profile. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline void SetPath(const Aws::String& value) { m_pathHasBeenSet = true; m_path = value; }
 
@@ -133,12 +135,13 @@ namespace Model
      * <p> The path to the instance profile. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline void SetPath(Aws::String&& value) { m_pathHasBeenSet = true; m_path = std::move(value); }
 
@@ -146,12 +149,13 @@ namespace Model
      * <p> The path to the instance profile. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline void SetPath(const char* value) { m_pathHasBeenSet = true; m_path.assign(value); }
 
@@ -159,12 +163,13 @@ namespace Model
      * <p> The path to the instance profile. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline CreateInstanceProfileRequest& WithPath(const Aws::String& value) { SetPath(value); return *this;}
 
@@ -172,12 +177,13 @@ namespace Model
      * <p> The path to the instance profile. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline CreateInstanceProfileRequest& WithPath(Aws::String&& value) { SetPath(std::move(value)); return *this;}
 
@@ -185,12 +191,13 @@ namespace Model
      * <p> The path to the instance profile. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline CreateInstanceProfileRequest& WithPath(const char* value) { SetPath(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/CreateLoginProfileRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/CreateLoginProfileRequest.h
index 9e980bbc991..17d991d71c0 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/CreateLoginProfileRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/CreateLoginProfileRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * exist.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * exist.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * exist.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * exist.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * exist.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline CreateLoginProfileRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * exist.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline CreateLoginProfileRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -105,99 +105,99 @@ namespace Model
      * exist.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline CreateLoginProfileRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
 
     /**
      * <p>The new password for the user.</p> <p>The <a
-     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of almost any printable ASCII
-     * character from the space (\u0020) through the end of the ASCII character range
-     * (\u00FF). You can also include the tab (\u0009), line feed (\u000A), and
-     * carriage return (\u000D) characters. Although any of these characters are valid
-     * in a password, note that many tools, such as the AWS Management Console, might
-     * restrict the ability to enter certain characters because they have special
-     * meaning within that tool.</p>
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> that is used to
+     * validate this parameter is a string of characters. That string can include
+     * almost any printable ASCII character from the space (\u0020) through the end of
+     * the ASCII character range (\u00FF). You can also include the tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D) characters. Any of these characters
+     * are valid in a password. However, many tools, such as the AWS Management
+     * Console, might restrict the ability to type certain characters because they have
+     * special meaning within that tool.</p>
      */
     inline const Aws::String& GetPassword() const{ return m_password; }
 
     /**
      * <p>The new password for the user.</p> <p>The <a
-     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of almost any printable ASCII
-     * character from the space (\u0020) through the end of the ASCII character range
-     * (\u00FF). You can also include the tab (\u0009), line feed (\u000A), and
-     * carriage return (\u000D) characters. Although any of these characters are valid
-     * in a password, note that many tools, such as the AWS Management Console, might
-     * restrict the ability to enter certain characters because they have special
-     * meaning within that tool.</p>
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> that is used to
+     * validate this parameter is a string of characters. That string can include
+     * almost any printable ASCII character from the space (\u0020) through the end of
+     * the ASCII character range (\u00FF). You can also include the tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D) characters. Any of these characters
+     * are valid in a password. However, many tools, such as the AWS Management
+     * Console, might restrict the ability to type certain characters because they have
+     * special meaning within that tool.</p>
      */
     inline void SetPassword(const Aws::String& value) { m_passwordHasBeenSet = true; m_password = value; }
 
     /**
      * <p>The new password for the user.</p> <p>The <a
-     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of almost any printable ASCII
-     * character from the space (\u0020) through the end of the ASCII character range
-     * (\u00FF). You can also include the tab (\u0009), line feed (\u000A), and
-     * carriage return (\u000D) characters. Although any of these characters are valid
-     * in a password, note that many tools, such as the AWS Management Console, might
-     * restrict the ability to enter certain characters because they have special
-     * meaning within that tool.</p>
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> that is used to
+     * validate this parameter is a string of characters. That string can include
+     * almost any printable ASCII character from the space (\u0020) through the end of
+     * the ASCII character range (\u00FF). You can also include the tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D) characters. Any of these characters
+     * are valid in a password. However, many tools, such as the AWS Management
+     * Console, might restrict the ability to type certain characters because they have
+     * special meaning within that tool.</p>
      */
     inline void SetPassword(Aws::String&& value) { m_passwordHasBeenSet = true; m_password = std::move(value); }
 
     /**
      * <p>The new password for the user.</p> <p>The <a
-     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of almost any printable ASCII
-     * character from the space (\u0020) through the end of the ASCII character range
-     * (\u00FF). You can also include the tab (\u0009), line feed (\u000A), and
-     * carriage return (\u000D) characters. Although any of these characters are valid
-     * in a password, note that many tools, such as the AWS Management Console, might
-     * restrict the ability to enter certain characters because they have special
-     * meaning within that tool.</p>
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> that is used to
+     * validate this parameter is a string of characters. That string can include
+     * almost any printable ASCII character from the space (\u0020) through the end of
+     * the ASCII character range (\u00FF). You can also include the tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D) characters. Any of these characters
+     * are valid in a password. However, many tools, such as the AWS Management
+     * Console, might restrict the ability to type certain characters because they have
+     * special meaning within that tool.</p>
      */
     inline void SetPassword(const char* value) { m_passwordHasBeenSet = true; m_password.assign(value); }
 
     /**
      * <p>The new password for the user.</p> <p>The <a
-     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of almost any printable ASCII
-     * character from the space (\u0020) through the end of the ASCII character range
-     * (\u00FF). You can also include the tab (\u0009), line feed (\u000A), and
-     * carriage return (\u000D) characters. Although any of these characters are valid
-     * in a password, note that many tools, such as the AWS Management Console, might
-     * restrict the ability to enter certain characters because they have special
-     * meaning within that tool.</p>
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> that is used to
+     * validate this parameter is a string of characters. That string can include
+     * almost any printable ASCII character from the space (\u0020) through the end of
+     * the ASCII character range (\u00FF). You can also include the tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D) characters. Any of these characters
+     * are valid in a password. However, many tools, such as the AWS Management
+     * Console, might restrict the ability to type certain characters because they have
+     * special meaning within that tool.</p>
      */
     inline CreateLoginProfileRequest& WithPassword(const Aws::String& value) { SetPassword(value); return *this;}
 
     /**
      * <p>The new password for the user.</p> <p>The <a
-     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of almost any printable ASCII
-     * character from the space (\u0020) through the end of the ASCII character range
-     * (\u00FF). You can also include the tab (\u0009), line feed (\u000A), and
-     * carriage return (\u000D) characters. Although any of these characters are valid
-     * in a password, note that many tools, such as the AWS Management Console, might
-     * restrict the ability to enter certain characters because they have special
-     * meaning within that tool.</p>
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> that is used to
+     * validate this parameter is a string of characters. That string can include
+     * almost any printable ASCII character from the space (\u0020) through the end of
+     * the ASCII character range (\u00FF). You can also include the tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D) characters. Any of these characters
+     * are valid in a password. However, many tools, such as the AWS Management
+     * Console, might restrict the ability to type certain characters because they have
+     * special meaning within that tool.</p>
      */
     inline CreateLoginProfileRequest& WithPassword(Aws::String&& value) { SetPassword(std::move(value)); return *this;}
 
     /**
      * <p>The new password for the user.</p> <p>The <a
-     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of almost any printable ASCII
-     * character from the space (\u0020) through the end of the ASCII character range
-     * (\u00FF). You can also include the tab (\u0009), line feed (\u000A), and
-     * carriage return (\u000D) characters. Although any of these characters are valid
-     * in a password, note that many tools, such as the AWS Management Console, might
-     * restrict the ability to enter certain characters because they have special
-     * meaning within that tool.</p>
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> that is used to
+     * validate this parameter is a string of characters. That string can include
+     * almost any printable ASCII character from the space (\u0020) through the end of
+     * the ASCII character range (\u00FF). You can also include the tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D) characters. Any of these characters
+     * are valid in a password. However, many tools, such as the AWS Management
+     * Console, might restrict the ability to type certain characters because they have
+     * special meaning within that tool.</p>
      */
     inline CreateLoginProfileRequest& WithPassword(const char* value) { SetPassword(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/CreateOpenIDConnectProviderRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/CreateOpenIDConnectProviderRequest.h
index 7ac6c09161b..87162928046 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/CreateOpenIDConnectProviderRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/CreateOpenIDConnectProviderRequest.h
@@ -48,86 +48,93 @@ namespace Model
   public:
 
     /**
-     * <p>The URL of the identity provider. The URL must begin with "https://" and
-     * should correspond to the <code>iss</code> claim in the provider's OpenID Connect
-     * ID tokens. Per the OIDC standard, path components are allowed but query
-     * parameters are not. Typically the URL consists of only a host name, like
-     * "https://server.example.org" or "https://example.com".</p> <p>You cannot
-     * register the same provider multiple times in a single AWS account. If you try to
-     * submit a URL that has already been used for an OpenID Connect provider in the
-     * AWS account, you will get an error.</p>
+     * <p>The URL of the identity provider. The URL must begin with
+     * <code>https://</code> and should correspond to the <code>iss</code> claim in the
+     * provider's OpenID Connect ID tokens. Per the OIDC standard, path components are
+     * allowed but query parameters are not. Typically the URL consists of only a
+     * hostname, like <code>https://server.example.org</code> or
+     * <code>https://example.com</code>.</p> <p>You cannot register the same provider
+     * multiple times in a single AWS account. If you try to submit a URL that has
+     * already been used for an OpenID Connect provider in the AWS account, you will
+     * get an error.</p>
      */
     inline const Aws::String& GetUrl() const{ return m_url; }
 
     /**
-     * <p>The URL of the identity provider. The URL must begin with "https://" and
-     * should correspond to the <code>iss</code> claim in the provider's OpenID Connect
-     * ID tokens. Per the OIDC standard, path components are allowed but query
-     * parameters are not. Typically the URL consists of only a host name, like
-     * "https://server.example.org" or "https://example.com".</p> <p>You cannot
-     * register the same provider multiple times in a single AWS account. If you try to
-     * submit a URL that has already been used for an OpenID Connect provider in the
-     * AWS account, you will get an error.</p>
+     * <p>The URL of the identity provider. The URL must begin with
+     * <code>https://</code> and should correspond to the <code>iss</code> claim in the
+     * provider's OpenID Connect ID tokens. Per the OIDC standard, path components are
+     * allowed but query parameters are not. Typically the URL consists of only a
+     * hostname, like <code>https://server.example.org</code> or
+     * <code>https://example.com</code>.</p> <p>You cannot register the same provider
+     * multiple times in a single AWS account. If you try to submit a URL that has
+     * already been used for an OpenID Connect provider in the AWS account, you will
+     * get an error.</p>
      */
     inline void SetUrl(const Aws::String& value) { m_urlHasBeenSet = true; m_url = value; }
 
     /**
-     * <p>The URL of the identity provider. The URL must begin with "https://" and
-     * should correspond to the <code>iss</code> claim in the provider's OpenID Connect
-     * ID tokens. Per the OIDC standard, path components are allowed but query
-     * parameters are not. Typically the URL consists of only a host name, like
-     * "https://server.example.org" or "https://example.com".</p> <p>You cannot
-     * register the same provider multiple times in a single AWS account. If you try to
-     * submit a URL that has already been used for an OpenID Connect provider in the
-     * AWS account, you will get an error.</p>
+     * <p>The URL of the identity provider. The URL must begin with
+     * <code>https://</code> and should correspond to the <code>iss</code> claim in the
+     * provider's OpenID Connect ID tokens. Per the OIDC standard, path components are
+     * allowed but query parameters are not. Typically the URL consists of only a
+     * hostname, like <code>https://server.example.org</code> or
+     * <code>https://example.com</code>.</p> <p>You cannot register the same provider
+     * multiple times in a single AWS account. If you try to submit a URL that has
+     * already been used for an OpenID Connect provider in the AWS account, you will
+     * get an error.</p>
      */
     inline void SetUrl(Aws::String&& value) { m_urlHasBeenSet = true; m_url = std::move(value); }
 
     /**
-     * <p>The URL of the identity provider. The URL must begin with "https://" and
-     * should correspond to the <code>iss</code> claim in the provider's OpenID Connect
-     * ID tokens. Per the OIDC standard, path components are allowed but query
-     * parameters are not. Typically the URL consists of only a host name, like
-     * "https://server.example.org" or "https://example.com".</p> <p>You cannot
-     * register the same provider multiple times in a single AWS account. If you try to
-     * submit a URL that has already been used for an OpenID Connect provider in the
-     * AWS account, you will get an error.</p>
+     * <p>The URL of the identity provider. The URL must begin with
+     * <code>https://</code> and should correspond to the <code>iss</code> claim in the
+     * provider's OpenID Connect ID tokens. Per the OIDC standard, path components are
+     * allowed but query parameters are not. Typically the URL consists of only a
+     * hostname, like <code>https://server.example.org</code> or
+     * <code>https://example.com</code>.</p> <p>You cannot register the same provider
+     * multiple times in a single AWS account. If you try to submit a URL that has
+     * already been used for an OpenID Connect provider in the AWS account, you will
+     * get an error.</p>
      */
     inline void SetUrl(const char* value) { m_urlHasBeenSet = true; m_url.assign(value); }
 
     /**
-     * <p>The URL of the identity provider. The URL must begin with "https://" and
-     * should correspond to the <code>iss</code> claim in the provider's OpenID Connect
-     * ID tokens. Per the OIDC standard, path components are allowed but query
-     * parameters are not. Typically the URL consists of only a host name, like
-     * "https://server.example.org" or "https://example.com".</p> <p>You cannot
-     * register the same provider multiple times in a single AWS account. If you try to
-     * submit a URL that has already been used for an OpenID Connect provider in the
-     * AWS account, you will get an error.</p>
+     * <p>The URL of the identity provider. The URL must begin with
+     * <code>https://</code> and should correspond to the <code>iss</code> claim in the
+     * provider's OpenID Connect ID tokens. Per the OIDC standard, path components are
+     * allowed but query parameters are not. Typically the URL consists of only a
+     * hostname, like <code>https://server.example.org</code> or
+     * <code>https://example.com</code>.</p> <p>You cannot register the same provider
+     * multiple times in a single AWS account. If you try to submit a URL that has
+     * already been used for an OpenID Connect provider in the AWS account, you will
+     * get an error.</p>
      */
     inline CreateOpenIDConnectProviderRequest& WithUrl(const Aws::String& value) { SetUrl(value); return *this;}
 
     /**
-     * <p>The URL of the identity provider. The URL must begin with "https://" and
-     * should correspond to the <code>iss</code> claim in the provider's OpenID Connect
-     * ID tokens. Per the OIDC standard, path components are allowed but query
-     * parameters are not. Typically the URL consists of only a host name, like
-     * "https://server.example.org" or "https://example.com".</p> <p>You cannot
-     * register the same provider multiple times in a single AWS account. If you try to
-     * submit a URL that has already been used for an OpenID Connect provider in the
-     * AWS account, you will get an error.</p>
+     * <p>The URL of the identity provider. The URL must begin with
+     * <code>https://</code> and should correspond to the <code>iss</code> claim in the
+     * provider's OpenID Connect ID tokens. Per the OIDC standard, path components are
+     * allowed but query parameters are not. Typically the URL consists of only a
+     * hostname, like <code>https://server.example.org</code> or
+     * <code>https://example.com</code>.</p> <p>You cannot register the same provider
+     * multiple times in a single AWS account. If you try to submit a URL that has
+     * already been used for an OpenID Connect provider in the AWS account, you will
+     * get an error.</p>
      */
     inline CreateOpenIDConnectProviderRequest& WithUrl(Aws::String&& value) { SetUrl(std::move(value)); return *this;}
 
     /**
-     * <p>The URL of the identity provider. The URL must begin with "https://" and
-     * should correspond to the <code>iss</code> claim in the provider's OpenID Connect
-     * ID tokens. Per the OIDC standard, path components are allowed but query
-     * parameters are not. Typically the URL consists of only a host name, like
-     * "https://server.example.org" or "https://example.com".</p> <p>You cannot
-     * register the same provider multiple times in a single AWS account. If you try to
-     * submit a URL that has already been used for an OpenID Connect provider in the
-     * AWS account, you will get an error.</p>
+     * <p>The URL of the identity provider. The URL must begin with
+     * <code>https://</code> and should correspond to the <code>iss</code> claim in the
+     * provider's OpenID Connect ID tokens. Per the OIDC standard, path components are
+     * allowed but query parameters are not. Typically the URL consists of only a
+     * hostname, like <code>https://server.example.org</code> or
+     * <code>https://example.com</code>.</p> <p>You cannot register the same provider
+     * multiple times in a single AWS account. If you try to submit a URL that has
+     * already been used for an OpenID Connect provider in the AWS account, you will
+     * get an error.</p>
      */
     inline CreateOpenIDConnectProviderRequest& WithUrl(const char* value) { SetUrl(value); return *this;}
 
@@ -140,7 +147,7 @@ namespace Model
      * multiple client IDs with the same provider. For example, you might have multiple
      * applications that use the same OIDC provider. You cannot register more than 100
      * client IDs with a single IAM OIDC provider.</p> <p>There is no defined format
-     * for a client ID. The <code>CreateOpenIDConnectProviderRequest</code> action
+     * for a client ID. The <code>CreateOpenIDConnectProviderRequest</code> operation
      * accepts client IDs up to 255 characters long.</p>
      */
     inline const Aws::Vector<Aws::String>& GetClientIDList() const{ return m_clientIDList; }
@@ -153,7 +160,7 @@ namespace Model
      * multiple client IDs with the same provider. For example, you might have multiple
      * applications that use the same OIDC provider. You cannot register more than 100
      * client IDs with a single IAM OIDC provider.</p> <p>There is no defined format
-     * for a client ID. The <code>CreateOpenIDConnectProviderRequest</code> action
+     * for a client ID. The <code>CreateOpenIDConnectProviderRequest</code> operation
      * accepts client IDs up to 255 characters long.</p>
      */
     inline void SetClientIDList(const Aws::Vector<Aws::String>& value) { m_clientIDListHasBeenSet = true; m_clientIDList = value; }
@@ -166,7 +173,7 @@ namespace Model
      * multiple client IDs with the same provider. For example, you might have multiple
      * applications that use the same OIDC provider. You cannot register more than 100
      * client IDs with a single IAM OIDC provider.</p> <p>There is no defined format
-     * for a client ID. The <code>CreateOpenIDConnectProviderRequest</code> action
+     * for a client ID. The <code>CreateOpenIDConnectProviderRequest</code> operation
      * accepts client IDs up to 255 characters long.</p>
      */
     inline void SetClientIDList(Aws::Vector<Aws::String>&& value) { m_clientIDListHasBeenSet = true; m_clientIDList = std::move(value); }
@@ -179,7 +186,7 @@ namespace Model
      * multiple client IDs with the same provider. For example, you might have multiple
      * applications that use the same OIDC provider. You cannot register more than 100
      * client IDs with a single IAM OIDC provider.</p> <p>There is no defined format
-     * for a client ID. The <code>CreateOpenIDConnectProviderRequest</code> action
+     * for a client ID. The <code>CreateOpenIDConnectProviderRequest</code> operation
      * accepts client IDs up to 255 characters long.</p>
      */
     inline CreateOpenIDConnectProviderRequest& WithClientIDList(const Aws::Vector<Aws::String>& value) { SetClientIDList(value); return *this;}
@@ -192,7 +199,7 @@ namespace Model
      * multiple client IDs with the same provider. For example, you might have multiple
      * applications that use the same OIDC provider. You cannot register more than 100
      * client IDs with a single IAM OIDC provider.</p> <p>There is no defined format
-     * for a client ID. The <code>CreateOpenIDConnectProviderRequest</code> action
+     * for a client ID. The <code>CreateOpenIDConnectProviderRequest</code> operation
      * accepts client IDs up to 255 characters long.</p>
      */
     inline CreateOpenIDConnectProviderRequest& WithClientIDList(Aws::Vector<Aws::String>&& value) { SetClientIDList(std::move(value)); return *this;}
@@ -205,7 +212,7 @@ namespace Model
      * multiple client IDs with the same provider. For example, you might have multiple
      * applications that use the same OIDC provider. You cannot register more than 100
      * client IDs with a single IAM OIDC provider.</p> <p>There is no defined format
-     * for a client ID. The <code>CreateOpenIDConnectProviderRequest</code> action
+     * for a client ID. The <code>CreateOpenIDConnectProviderRequest</code> operation
      * accepts client IDs up to 255 characters long.</p>
      */
     inline CreateOpenIDConnectProviderRequest& AddClientIDList(const Aws::String& value) { m_clientIDListHasBeenSet = true; m_clientIDList.push_back(value); return *this; }
@@ -218,7 +225,7 @@ namespace Model
      * multiple client IDs with the same provider. For example, you might have multiple
      * applications that use the same OIDC provider. You cannot register more than 100
      * client IDs with a single IAM OIDC provider.</p> <p>There is no defined format
-     * for a client ID. The <code>CreateOpenIDConnectProviderRequest</code> action
+     * for a client ID. The <code>CreateOpenIDConnectProviderRequest</code> operation
      * accepts client IDs up to 255 characters long.</p>
      */
     inline CreateOpenIDConnectProviderRequest& AddClientIDList(Aws::String&& value) { m_clientIDListHasBeenSet = true; m_clientIDList.push_back(std::move(value)); return *this; }
@@ -231,7 +238,7 @@ namespace Model
      * multiple client IDs with the same provider. For example, you might have multiple
      * applications that use the same OIDC provider. You cannot register more than 100
      * client IDs with a single IAM OIDC provider.</p> <p>There is no defined format
-     * for a client ID. The <code>CreateOpenIDConnectProviderRequest</code> action
+     * for a client ID. The <code>CreateOpenIDConnectProviderRequest</code> operation
      * accepts client IDs up to 255 characters long.</p>
      */
     inline CreateOpenIDConnectProviderRequest& AddClientIDList(const char* value) { m_clientIDListHasBeenSet = true; m_clientIDList.push_back(value); return *this; }
@@ -239,18 +246,19 @@ namespace Model
 
     /**
      * <p>A list of server certificate thumbprints for the OpenID Connect (OIDC)
-     * identity provider's server certificate(s). Typically this list includes only one
+     * identity provider's server certificates. Typically this list includes only one
      * entry. However, IAM lets you have up to five thumbprints for an OIDC provider.
      * This lets you maintain multiple thumbprints if the identity provider is rotating
      * certificates.</p> <p>The server certificate thumbprint is the hex-encoded SHA-1
      * hash value of the X.509 certificate used by the domain where the OpenID Connect
      * provider makes its keys available. It is always a 40-character string.</p>
      * <p>You must provide at least one thumbprint when creating an IAM OIDC provider.
-     * For example, if the OIDC provider is <code>server.example.com</code> and the
-     * provider stores its keys at "https://keys.server.example.com/openid-connect",
-     * the thumbprint string would be the hex-encoded SHA-1 hash value of the
-     * certificate used by https://keys.server.example.com.</p> <p>For more information
-     * about obtaining the OIDC provider's thumbprint, see <a
+     * For example, assume that the OIDC provider is <code>server.example.com</code>
+     * and the provider stores its keys at
+     * https://keys.server.example.com/openid-connect. In that case, the thumbprint
+     * string would be the hex-encoded SHA-1 hash value of the certificate used by
+     * https://keys.server.example.com.</p> <p>For more information about obtaining the
+     * OIDC provider's thumbprint, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/identity-providers-oidc-obtain-thumbprint.html">Obtaining
      * the Thumbprint for an OpenID Connect Provider</a> in the <i>IAM User
      * Guide</i>.</p>
@@ -259,18 +267,19 @@ namespace Model
 
     /**
      * <p>A list of server certificate thumbprints for the OpenID Connect (OIDC)
-     * identity provider's server certificate(s). Typically this list includes only one
+     * identity provider's server certificates. Typically this list includes only one
      * entry. However, IAM lets you have up to five thumbprints for an OIDC provider.
      * This lets you maintain multiple thumbprints if the identity provider is rotating
      * certificates.</p> <p>The server certificate thumbprint is the hex-encoded SHA-1
      * hash value of the X.509 certificate used by the domain where the OpenID Connect
      * provider makes its keys available. It is always a 40-character string.</p>
      * <p>You must provide at least one thumbprint when creating an IAM OIDC provider.
-     * For example, if the OIDC provider is <code>server.example.com</code> and the
-     * provider stores its keys at "https://keys.server.example.com/openid-connect",
-     * the thumbprint string would be the hex-encoded SHA-1 hash value of the
-     * certificate used by https://keys.server.example.com.</p> <p>For more information
-     * about obtaining the OIDC provider's thumbprint, see <a
+     * For example, assume that the OIDC provider is <code>server.example.com</code>
+     * and the provider stores its keys at
+     * https://keys.server.example.com/openid-connect. In that case, the thumbprint
+     * string would be the hex-encoded SHA-1 hash value of the certificate used by
+     * https://keys.server.example.com.</p> <p>For more information about obtaining the
+     * OIDC provider's thumbprint, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/identity-providers-oidc-obtain-thumbprint.html">Obtaining
      * the Thumbprint for an OpenID Connect Provider</a> in the <i>IAM User
      * Guide</i>.</p>
@@ -279,18 +288,19 @@ namespace Model
 
     /**
      * <p>A list of server certificate thumbprints for the OpenID Connect (OIDC)
-     * identity provider's server certificate(s). Typically this list includes only one
+     * identity provider's server certificates. Typically this list includes only one
      * entry. However, IAM lets you have up to five thumbprints for an OIDC provider.
      * This lets you maintain multiple thumbprints if the identity provider is rotating
      * certificates.</p> <p>The server certificate thumbprint is the hex-encoded SHA-1
      * hash value of the X.509 certificate used by the domain where the OpenID Connect
      * provider makes its keys available. It is always a 40-character string.</p>
      * <p>You must provide at least one thumbprint when creating an IAM OIDC provider.
-     * For example, if the OIDC provider is <code>server.example.com</code> and the
-     * provider stores its keys at "https://keys.server.example.com/openid-connect",
-     * the thumbprint string would be the hex-encoded SHA-1 hash value of the
-     * certificate used by https://keys.server.example.com.</p> <p>For more information
-     * about obtaining the OIDC provider's thumbprint, see <a
+     * For example, assume that the OIDC provider is <code>server.example.com</code>
+     * and the provider stores its keys at
+     * https://keys.server.example.com/openid-connect. In that case, the thumbprint
+     * string would be the hex-encoded SHA-1 hash value of the certificate used by
+     * https://keys.server.example.com.</p> <p>For more information about obtaining the
+     * OIDC provider's thumbprint, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/identity-providers-oidc-obtain-thumbprint.html">Obtaining
      * the Thumbprint for an OpenID Connect Provider</a> in the <i>IAM User
      * Guide</i>.</p>
@@ -299,18 +309,19 @@ namespace Model
 
     /**
      * <p>A list of server certificate thumbprints for the OpenID Connect (OIDC)
-     * identity provider's server certificate(s). Typically this list includes only one
+     * identity provider's server certificates. Typically this list includes only one
      * entry. However, IAM lets you have up to five thumbprints for an OIDC provider.
      * This lets you maintain multiple thumbprints if the identity provider is rotating
      * certificates.</p> <p>The server certificate thumbprint is the hex-encoded SHA-1
      * hash value of the X.509 certificate used by the domain where the OpenID Connect
      * provider makes its keys available. It is always a 40-character string.</p>
      * <p>You must provide at least one thumbprint when creating an IAM OIDC provider.
-     * For example, if the OIDC provider is <code>server.example.com</code> and the
-     * provider stores its keys at "https://keys.server.example.com/openid-connect",
-     * the thumbprint string would be the hex-encoded SHA-1 hash value of the
-     * certificate used by https://keys.server.example.com.</p> <p>For more information
-     * about obtaining the OIDC provider's thumbprint, see <a
+     * For example, assume that the OIDC provider is <code>server.example.com</code>
+     * and the provider stores its keys at
+     * https://keys.server.example.com/openid-connect. In that case, the thumbprint
+     * string would be the hex-encoded SHA-1 hash value of the certificate used by
+     * https://keys.server.example.com.</p> <p>For more information about obtaining the
+     * OIDC provider's thumbprint, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/identity-providers-oidc-obtain-thumbprint.html">Obtaining
      * the Thumbprint for an OpenID Connect Provider</a> in the <i>IAM User
      * Guide</i>.</p>
@@ -319,18 +330,19 @@ namespace Model
 
     /**
      * <p>A list of server certificate thumbprints for the OpenID Connect (OIDC)
-     * identity provider's server certificate(s). Typically this list includes only one
+     * identity provider's server certificates. Typically this list includes only one
      * entry. However, IAM lets you have up to five thumbprints for an OIDC provider.
      * This lets you maintain multiple thumbprints if the identity provider is rotating
      * certificates.</p> <p>The server certificate thumbprint is the hex-encoded SHA-1
      * hash value of the X.509 certificate used by the domain where the OpenID Connect
      * provider makes its keys available. It is always a 40-character string.</p>
      * <p>You must provide at least one thumbprint when creating an IAM OIDC provider.
-     * For example, if the OIDC provider is <code>server.example.com</code> and the
-     * provider stores its keys at "https://keys.server.example.com/openid-connect",
-     * the thumbprint string would be the hex-encoded SHA-1 hash value of the
-     * certificate used by https://keys.server.example.com.</p> <p>For more information
-     * about obtaining the OIDC provider's thumbprint, see <a
+     * For example, assume that the OIDC provider is <code>server.example.com</code>
+     * and the provider stores its keys at
+     * https://keys.server.example.com/openid-connect. In that case, the thumbprint
+     * string would be the hex-encoded SHA-1 hash value of the certificate used by
+     * https://keys.server.example.com.</p> <p>For more information about obtaining the
+     * OIDC provider's thumbprint, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/identity-providers-oidc-obtain-thumbprint.html">Obtaining
      * the Thumbprint for an OpenID Connect Provider</a> in the <i>IAM User
      * Guide</i>.</p>
@@ -339,18 +351,19 @@ namespace Model
 
     /**
      * <p>A list of server certificate thumbprints for the OpenID Connect (OIDC)
-     * identity provider's server certificate(s). Typically this list includes only one
+     * identity provider's server certificates. Typically this list includes only one
      * entry. However, IAM lets you have up to five thumbprints for an OIDC provider.
      * This lets you maintain multiple thumbprints if the identity provider is rotating
      * certificates.</p> <p>The server certificate thumbprint is the hex-encoded SHA-1
      * hash value of the X.509 certificate used by the domain where the OpenID Connect
      * provider makes its keys available. It is always a 40-character string.</p>
      * <p>You must provide at least one thumbprint when creating an IAM OIDC provider.
-     * For example, if the OIDC provider is <code>server.example.com</code> and the
-     * provider stores its keys at "https://keys.server.example.com/openid-connect",
-     * the thumbprint string would be the hex-encoded SHA-1 hash value of the
-     * certificate used by https://keys.server.example.com.</p> <p>For more information
-     * about obtaining the OIDC provider's thumbprint, see <a
+     * For example, assume that the OIDC provider is <code>server.example.com</code>
+     * and the provider stores its keys at
+     * https://keys.server.example.com/openid-connect. In that case, the thumbprint
+     * string would be the hex-encoded SHA-1 hash value of the certificate used by
+     * https://keys.server.example.com.</p> <p>For more information about obtaining the
+     * OIDC provider's thumbprint, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/identity-providers-oidc-obtain-thumbprint.html">Obtaining
      * the Thumbprint for an OpenID Connect Provider</a> in the <i>IAM User
      * Guide</i>.</p>
@@ -359,18 +372,19 @@ namespace Model
 
     /**
      * <p>A list of server certificate thumbprints for the OpenID Connect (OIDC)
-     * identity provider's server certificate(s). Typically this list includes only one
+     * identity provider's server certificates. Typically this list includes only one
      * entry. However, IAM lets you have up to five thumbprints for an OIDC provider.
      * This lets you maintain multiple thumbprints if the identity provider is rotating
      * certificates.</p> <p>The server certificate thumbprint is the hex-encoded SHA-1
      * hash value of the X.509 certificate used by the domain where the OpenID Connect
      * provider makes its keys available. It is always a 40-character string.</p>
      * <p>You must provide at least one thumbprint when creating an IAM OIDC provider.
-     * For example, if the OIDC provider is <code>server.example.com</code> and the
-     * provider stores its keys at "https://keys.server.example.com/openid-connect",
-     * the thumbprint string would be the hex-encoded SHA-1 hash value of the
-     * certificate used by https://keys.server.example.com.</p> <p>For more information
-     * about obtaining the OIDC provider's thumbprint, see <a
+     * For example, assume that the OIDC provider is <code>server.example.com</code>
+     * and the provider stores its keys at
+     * https://keys.server.example.com/openid-connect. In that case, the thumbprint
+     * string would be the hex-encoded SHA-1 hash value of the certificate used by
+     * https://keys.server.example.com.</p> <p>For more information about obtaining the
+     * OIDC provider's thumbprint, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/identity-providers-oidc-obtain-thumbprint.html">Obtaining
      * the Thumbprint for an OpenID Connect Provider</a> in the <i>IAM User
      * Guide</i>.</p>
@@ -379,18 +393,19 @@ namespace Model
 
     /**
      * <p>A list of server certificate thumbprints for the OpenID Connect (OIDC)
-     * identity provider's server certificate(s). Typically this list includes only one
+     * identity provider's server certificates. Typically this list includes only one
      * entry. However, IAM lets you have up to five thumbprints for an OIDC provider.
      * This lets you maintain multiple thumbprints if the identity provider is rotating
      * certificates.</p> <p>The server certificate thumbprint is the hex-encoded SHA-1
      * hash value of the X.509 certificate used by the domain where the OpenID Connect
      * provider makes its keys available. It is always a 40-character string.</p>
      * <p>You must provide at least one thumbprint when creating an IAM OIDC provider.
-     * For example, if the OIDC provider is <code>server.example.com</code> and the
-     * provider stores its keys at "https://keys.server.example.com/openid-connect",
-     * the thumbprint string would be the hex-encoded SHA-1 hash value of the
-     * certificate used by https://keys.server.example.com.</p> <p>For more information
-     * about obtaining the OIDC provider's thumbprint, see <a
+     * For example, assume that the OIDC provider is <code>server.example.com</code>
+     * and the provider stores its keys at
+     * https://keys.server.example.com/openid-connect. In that case, the thumbprint
+     * string would be the hex-encoded SHA-1 hash value of the certificate used by
+     * https://keys.server.example.com.</p> <p>For more information about obtaining the
+     * OIDC provider's thumbprint, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/identity-providers-oidc-obtain-thumbprint.html">Obtaining
      * the Thumbprint for an OpenID Connect Provider</a> in the <i>IAM User
      * Guide</i>.</p>
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/CreatePolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/CreatePolicyRequest.h
index fe33a03696e..21e9cc686ab 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/CreatePolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/CreatePolicyRequest.h
@@ -50,7 +50,7 @@ namespace Model
      * <p>The friendly name of the policy.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetPolicyName() const{ return m_policyName; }
 
@@ -58,7 +58,7 @@ namespace Model
      * <p>The friendly name of the policy.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(const Aws::String& value) { m_policyNameHasBeenSet = true; m_policyName = value; }
 
@@ -66,7 +66,7 @@ namespace Model
      * <p>The friendly name of the policy.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(Aws::String&& value) { m_policyNameHasBeenSet = true; m_policyName = std::move(value); }
 
@@ -74,7 +74,7 @@ namespace Model
      * <p>The friendly name of the policy.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(const char* value) { m_policyNameHasBeenSet = true; m_policyName.assign(value); }
 
@@ -82,7 +82,7 @@ namespace Model
      * <p>The friendly name of the policy.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline CreatePolicyRequest& WithPolicyName(const Aws::String& value) { SetPolicyName(value); return *this;}
 
@@ -90,7 +90,7 @@ namespace Model
      * <p>The friendly name of the policy.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline CreatePolicyRequest& WithPolicyName(Aws::String&& value) { SetPolicyName(std::move(value)); return *this;}
 
@@ -98,7 +98,7 @@ namespace Model
      * <p>The friendly name of the policy.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline CreatePolicyRequest& WithPolicyName(const char* value) { SetPolicyName(value); return *this;}
 
@@ -107,12 +107,13 @@ namespace Model
      * <p>The path for the policy.</p> <p>For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline const Aws::String& GetPath() const{ return m_path; }
 
@@ -120,12 +121,13 @@ namespace Model
      * <p>The path for the policy.</p> <p>For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline void SetPath(const Aws::String& value) { m_pathHasBeenSet = true; m_path = value; }
 
@@ -133,12 +135,13 @@ namespace Model
      * <p>The path for the policy.</p> <p>For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline void SetPath(Aws::String&& value) { m_pathHasBeenSet = true; m_path = std::move(value); }
 
@@ -146,12 +149,13 @@ namespace Model
      * <p>The path for the policy.</p> <p>For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline void SetPath(const char* value) { m_pathHasBeenSet = true; m_path.assign(value); }
 
@@ -159,12 +163,13 @@ namespace Model
      * <p>The path for the policy.</p> <p>For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline CreatePolicyRequest& WithPath(const Aws::String& value) { SetPath(value); return *this;}
 
@@ -172,12 +177,13 @@ namespace Model
      * <p>The path for the policy.</p> <p>For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline CreatePolicyRequest& WithPath(Aws::String&& value) { SetPath(std::move(value)); return *this;}
 
@@ -185,12 +191,13 @@ namespace Model
      * <p>The path for the policy.</p> <p>For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline CreatePolicyRequest& WithPath(const char* value) { SetPath(value); return *this;}
 
@@ -198,84 +205,84 @@ namespace Model
     /**
      * <p>The JSON policy document that you want to use as the content for the new
      * policy.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a>
-     * used to validate this parameter is a string of characters consisting of any
-     * printable ASCII character ranging from the space character (\u0020) through end
-     * of the ASCII character range as well as the printable characters in the Basic
-     * Latin and Latin-1 Supplement character set (through \u00FF). It also includes
-     * the special characters tab (\u0009), line feed (\u000A), and carriage return
-     * (\u000D).</p>
+     * used to validate this parameter is a string of characters consisting of the
+     * following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space
+     * character (\u0020) through the end of the ASCII character range</p> </li> <li>
+     * <p>The printable characters in the Basic Latin and Latin-1 Supplement character
+     * set (through \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline const Aws::String& GetPolicyDocument() const{ return m_policyDocument; }
 
     /**
      * <p>The JSON policy document that you want to use as the content for the new
      * policy.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a>
-     * used to validate this parameter is a string of characters consisting of any
-     * printable ASCII character ranging from the space character (\u0020) through end
-     * of the ASCII character range as well as the printable characters in the Basic
-     * Latin and Latin-1 Supplement character set (through \u00FF). It also includes
-     * the special characters tab (\u0009), line feed (\u000A), and carriage return
-     * (\u000D).</p>
+     * used to validate this parameter is a string of characters consisting of the
+     * following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space
+     * character (\u0020) through the end of the ASCII character range</p> </li> <li>
+     * <p>The printable characters in the Basic Latin and Latin-1 Supplement character
+     * set (through \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyDocument(const Aws::String& value) { m_policyDocumentHasBeenSet = true; m_policyDocument = value; }
 
     /**
      * <p>The JSON policy document that you want to use as the content for the new
      * policy.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a>
-     * used to validate this parameter is a string of characters consisting of any
-     * printable ASCII character ranging from the space character (\u0020) through end
-     * of the ASCII character range as well as the printable characters in the Basic
-     * Latin and Latin-1 Supplement character set (through \u00FF). It also includes
-     * the special characters tab (\u0009), line feed (\u000A), and carriage return
-     * (\u000D).</p>
+     * used to validate this parameter is a string of characters consisting of the
+     * following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space
+     * character (\u0020) through the end of the ASCII character range</p> </li> <li>
+     * <p>The printable characters in the Basic Latin and Latin-1 Supplement character
+     * set (through \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyDocument(Aws::String&& value) { m_policyDocumentHasBeenSet = true; m_policyDocument = std::move(value); }
 
     /**
      * <p>The JSON policy document that you want to use as the content for the new
      * policy.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a>
-     * used to validate this parameter is a string of characters consisting of any
-     * printable ASCII character ranging from the space character (\u0020) through end
-     * of the ASCII character range as well as the printable characters in the Basic
-     * Latin and Latin-1 Supplement character set (through \u00FF). It also includes
-     * the special characters tab (\u0009), line feed (\u000A), and carriage return
-     * (\u000D).</p>
+     * used to validate this parameter is a string of characters consisting of the
+     * following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space
+     * character (\u0020) through the end of the ASCII character range</p> </li> <li>
+     * <p>The printable characters in the Basic Latin and Latin-1 Supplement character
+     * set (through \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyDocument(const char* value) { m_policyDocumentHasBeenSet = true; m_policyDocument.assign(value); }
 
     /**
      * <p>The JSON policy document that you want to use as the content for the new
      * policy.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a>
-     * used to validate this parameter is a string of characters consisting of any
-     * printable ASCII character ranging from the space character (\u0020) through end
-     * of the ASCII character range as well as the printable characters in the Basic
-     * Latin and Latin-1 Supplement character set (through \u00FF). It also includes
-     * the special characters tab (\u0009), line feed (\u000A), and carriage return
-     * (\u000D).</p>
+     * used to validate this parameter is a string of characters consisting of the
+     * following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space
+     * character (\u0020) through the end of the ASCII character range</p> </li> <li>
+     * <p>The printable characters in the Basic Latin and Latin-1 Supplement character
+     * set (through \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline CreatePolicyRequest& WithPolicyDocument(const Aws::String& value) { SetPolicyDocument(value); return *this;}
 
     /**
      * <p>The JSON policy document that you want to use as the content for the new
      * policy.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a>
-     * used to validate this parameter is a string of characters consisting of any
-     * printable ASCII character ranging from the space character (\u0020) through end
-     * of the ASCII character range as well as the printable characters in the Basic
-     * Latin and Latin-1 Supplement character set (through \u00FF). It also includes
-     * the special characters tab (\u0009), line feed (\u000A), and carriage return
-     * (\u000D).</p>
+     * used to validate this parameter is a string of characters consisting of the
+     * following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space
+     * character (\u0020) through the end of the ASCII character range</p> </li> <li>
+     * <p>The printable characters in the Basic Latin and Latin-1 Supplement character
+     * set (through \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline CreatePolicyRequest& WithPolicyDocument(Aws::String&& value) { SetPolicyDocument(std::move(value)); return *this;}
 
     /**
      * <p>The JSON policy document that you want to use as the content for the new
      * policy.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a>
-     * used to validate this parameter is a string of characters consisting of any
-     * printable ASCII character ranging from the space character (\u0020) through end
-     * of the ASCII character range as well as the printable characters in the Basic
-     * Latin and Latin-1 Supplement character set (through \u00FF). It also includes
-     * the special characters tab (\u0009), line feed (\u000A), and carriage return
-     * (\u000D).</p>
+     * used to validate this parameter is a string of characters consisting of the
+     * following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space
+     * character (\u0020) through the end of the ASCII character range</p> </li> <li>
+     * <p>The printable characters in the Basic Latin and Latin-1 Supplement character
+     * set (through \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline CreatePolicyRequest& WithPolicyDocument(const char* value) { SetPolicyDocument(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/CreatePolicyVersionRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/CreatePolicyVersionRequest.h
index 6b8595de147..39b29826650 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/CreatePolicyVersionRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/CreatePolicyVersionRequest.h
@@ -114,11 +114,12 @@ namespace Model
      * <p>The JSON policy document that you want to use as the content for this new
      * version of the policy.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline const Aws::String& GetPolicyDocument() const{ return m_policyDocument; }
 
@@ -126,11 +127,12 @@ namespace Model
      * <p>The JSON policy document that you want to use as the content for this new
      * version of the policy.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyDocument(const Aws::String& value) { m_policyDocumentHasBeenSet = true; m_policyDocument = value; }
 
@@ -138,11 +140,12 @@ namespace Model
      * <p>The JSON policy document that you want to use as the content for this new
      * version of the policy.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyDocument(Aws::String&& value) { m_policyDocumentHasBeenSet = true; m_policyDocument = std::move(value); }
 
@@ -150,11 +153,12 @@ namespace Model
      * <p>The JSON policy document that you want to use as the content for this new
      * version of the policy.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyDocument(const char* value) { m_policyDocumentHasBeenSet = true; m_policyDocument.assign(value); }
 
@@ -162,11 +166,12 @@ namespace Model
      * <p>The JSON policy document that you want to use as the content for this new
      * version of the policy.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline CreatePolicyVersionRequest& WithPolicyDocument(const Aws::String& value) { SetPolicyDocument(value); return *this;}
 
@@ -174,11 +179,12 @@ namespace Model
      * <p>The JSON policy document that you want to use as the content for this new
      * version of the policy.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline CreatePolicyVersionRequest& WithPolicyDocument(Aws::String&& value) { SetPolicyDocument(std::move(value)); return *this;}
 
@@ -186,11 +192,12 @@ namespace Model
      * <p>The JSON policy document that you want to use as the content for this new
      * version of the policy.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline CreatePolicyVersionRequest& WithPolicyDocument(const char* value) { SetPolicyDocument(value); return *this;}
 
@@ -198,9 +205,9 @@ namespace Model
     /**
      * <p>Specifies whether to set this version as the policy's default version.</p>
      * <p>When this parameter is <code>true</code>, the new policy version becomes the
-     * operative version; that is, the version that is in effect for the IAM users,
-     * groups, and roles that the policy is attached to.</p> <p>For more information
-     * about managed policy versions, see <a
+     * operative version. That is, it becomes the version that is in effect for the IAM
+     * users, groups, and roles that the policy is attached to.</p> <p>For more
+     * information about managed policy versions, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-versions.html">Versioning
      * for Managed Policies</a> in the <i>IAM User Guide</i>.</p>
      */
@@ -209,9 +216,9 @@ namespace Model
     /**
      * <p>Specifies whether to set this version as the policy's default version.</p>
      * <p>When this parameter is <code>true</code>, the new policy version becomes the
-     * operative version; that is, the version that is in effect for the IAM users,
-     * groups, and roles that the policy is attached to.</p> <p>For more information
-     * about managed policy versions, see <a
+     * operative version. That is, it becomes the version that is in effect for the IAM
+     * users, groups, and roles that the policy is attached to.</p> <p>For more
+     * information about managed policy versions, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-versions.html">Versioning
      * for Managed Policies</a> in the <i>IAM User Guide</i>.</p>
      */
@@ -220,9 +227,9 @@ namespace Model
     /**
      * <p>Specifies whether to set this version as the policy's default version.</p>
      * <p>When this parameter is <code>true</code>, the new policy version becomes the
-     * operative version; that is, the version that is in effect for the IAM users,
-     * groups, and roles that the policy is attached to.</p> <p>For more information
-     * about managed policy versions, see <a
+     * operative version. That is, it becomes the version that is in effect for the IAM
+     * users, groups, and roles that the policy is attached to.</p> <p>For more
+     * information about managed policy versions, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-versions.html">Versioning
      * for Managed Policies</a> in the <i>IAM User Guide</i>.</p>
      */
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/CreateRoleRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/CreateRoleRequest.h
index d62726e9fae..b1e67180a9e 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/CreateRoleRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/CreateRoleRequest.h
@@ -50,12 +50,13 @@ namespace Model
      * <p> The path to the role. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline const Aws::String& GetPath() const{ return m_path; }
 
@@ -63,12 +64,13 @@ namespace Model
      * <p> The path to the role. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline void SetPath(const Aws::String& value) { m_pathHasBeenSet = true; m_path = value; }
 
@@ -76,12 +78,13 @@ namespace Model
      * <p> The path to the role. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline void SetPath(Aws::String&& value) { m_pathHasBeenSet = true; m_path = std::move(value); }
 
@@ -89,12 +92,13 @@ namespace Model
      * <p> The path to the role. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline void SetPath(const char* value) { m_pathHasBeenSet = true; m_path.assign(value); }
 
@@ -102,12 +106,13 @@ namespace Model
      * <p> The path to the role. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline CreateRoleRequest& WithPath(const Aws::String& value) { SetPath(value); return *this;}
 
@@ -115,12 +120,13 @@ namespace Model
      * <p> The path to the role. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline CreateRoleRequest& WithPath(Aws::String&& value) { SetPath(std::move(value)); return *this;}
 
@@ -128,12 +134,13 @@ namespace Model
      * <p> The path to the role. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline CreateRoleRequest& WithPath(const char* value) { SetPath(value); return *this;}
 
@@ -213,11 +220,11 @@ namespace Model
      * <p>The trust relationship policy document that grants an entity permission to
      * assume the role.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a> used to validate this parameter is a string of characters consisting
-     * of any printable ASCII character ranging from the space character (\u0020)
-     * through end of the ASCII character range as well as the printable characters in
-     * the Basic Latin and Latin-1 Supplement character set (through \u00FF). It also
-     * includes the special characters tab (\u0009), line feed (\u000A), and carriage
-     * return (\u000D).</p>
+     * of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from
+     * the space character (\u0020) through the end of the ASCII character range</p>
+     * </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement
+     * character set (through \u00FF)</p> </li> <li> <p>The special characters tab
+     * (\u0009), line feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline const Aws::String& GetAssumeRolePolicyDocument() const{ return m_assumeRolePolicyDocument; }
 
@@ -225,11 +232,11 @@ namespace Model
      * <p>The trust relationship policy document that grants an entity permission to
      * assume the role.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a> used to validate this parameter is a string of characters consisting
-     * of any printable ASCII character ranging from the space character (\u0020)
-     * through end of the ASCII character range as well as the printable characters in
-     * the Basic Latin and Latin-1 Supplement character set (through \u00FF). It also
-     * includes the special characters tab (\u0009), line feed (\u000A), and carriage
-     * return (\u000D).</p>
+     * of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from
+     * the space character (\u0020) through the end of the ASCII character range</p>
+     * </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement
+     * character set (through \u00FF)</p> </li> <li> <p>The special characters tab
+     * (\u0009), line feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetAssumeRolePolicyDocument(const Aws::String& value) { m_assumeRolePolicyDocumentHasBeenSet = true; m_assumeRolePolicyDocument = value; }
 
@@ -237,11 +244,11 @@ namespace Model
      * <p>The trust relationship policy document that grants an entity permission to
      * assume the role.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a> used to validate this parameter is a string of characters consisting
-     * of any printable ASCII character ranging from the space character (\u0020)
-     * through end of the ASCII character range as well as the printable characters in
-     * the Basic Latin and Latin-1 Supplement character set (through \u00FF). It also
-     * includes the special characters tab (\u0009), line feed (\u000A), and carriage
-     * return (\u000D).</p>
+     * of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from
+     * the space character (\u0020) through the end of the ASCII character range</p>
+     * </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement
+     * character set (through \u00FF)</p> </li> <li> <p>The special characters tab
+     * (\u0009), line feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetAssumeRolePolicyDocument(Aws::String&& value) { m_assumeRolePolicyDocumentHasBeenSet = true; m_assumeRolePolicyDocument = std::move(value); }
 
@@ -249,11 +256,11 @@ namespace Model
      * <p>The trust relationship policy document that grants an entity permission to
      * assume the role.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a> used to validate this parameter is a string of characters consisting
-     * of any printable ASCII character ranging from the space character (\u0020)
-     * through end of the ASCII character range as well as the printable characters in
-     * the Basic Latin and Latin-1 Supplement character set (through \u00FF). It also
-     * includes the special characters tab (\u0009), line feed (\u000A), and carriage
-     * return (\u000D).</p>
+     * of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from
+     * the space character (\u0020) through the end of the ASCII character range</p>
+     * </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement
+     * character set (through \u00FF)</p> </li> <li> <p>The special characters tab
+     * (\u0009), line feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetAssumeRolePolicyDocument(const char* value) { m_assumeRolePolicyDocumentHasBeenSet = true; m_assumeRolePolicyDocument.assign(value); }
 
@@ -261,11 +268,11 @@ namespace Model
      * <p>The trust relationship policy document that grants an entity permission to
      * assume the role.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a> used to validate this parameter is a string of characters consisting
-     * of any printable ASCII character ranging from the space character (\u0020)
-     * through end of the ASCII character range as well as the printable characters in
-     * the Basic Latin and Latin-1 Supplement character set (through \u00FF). It also
-     * includes the special characters tab (\u0009), line feed (\u000A), and carriage
-     * return (\u000D).</p>
+     * of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from
+     * the space character (\u0020) through the end of the ASCII character range</p>
+     * </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement
+     * character set (through \u00FF)</p> </li> <li> <p>The special characters tab
+     * (\u0009), line feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline CreateRoleRequest& WithAssumeRolePolicyDocument(const Aws::String& value) { SetAssumeRolePolicyDocument(value); return *this;}
 
@@ -273,11 +280,11 @@ namespace Model
      * <p>The trust relationship policy document that grants an entity permission to
      * assume the role.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a> used to validate this parameter is a string of characters consisting
-     * of any printable ASCII character ranging from the space character (\u0020)
-     * through end of the ASCII character range as well as the printable characters in
-     * the Basic Latin and Latin-1 Supplement character set (through \u00FF). It also
-     * includes the special characters tab (\u0009), line feed (\u000A), and carriage
-     * return (\u000D).</p>
+     * of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from
+     * the space character (\u0020) through the end of the ASCII character range</p>
+     * </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement
+     * character set (through \u00FF)</p> </li> <li> <p>The special characters tab
+     * (\u0009), line feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline CreateRoleRequest& WithAssumeRolePolicyDocument(Aws::String&& value) { SetAssumeRolePolicyDocument(std::move(value)); return *this;}
 
@@ -285,50 +292,108 @@ namespace Model
      * <p>The trust relationship policy document that grants an entity permission to
      * assume the role.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a> used to validate this parameter is a string of characters consisting
-     * of any printable ASCII character ranging from the space character (\u0020)
-     * through end of the ASCII character range as well as the printable characters in
-     * the Basic Latin and Latin-1 Supplement character set (through \u00FF). It also
-     * includes the special characters tab (\u0009), line feed (\u000A), and carriage
-     * return (\u000D).</p>
+     * of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from
+     * the space character (\u0020) through the end of the ASCII character range</p>
+     * </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement
+     * character set (through \u00FF)</p> </li> <li> <p>The special characters tab
+     * (\u0009), line feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline CreateRoleRequest& WithAssumeRolePolicyDocument(const char* value) { SetAssumeRolePolicyDocument(value); return *this;}
 
 
     /**
-     * <p>A customer-provided description of the role.</p>
+     * <p>A description of the role.</p>
      */
     inline const Aws::String& GetDescription() const{ return m_description; }
 
     /**
-     * <p>A customer-provided description of the role.</p>
+     * <p>A description of the role.</p>
      */
     inline void SetDescription(const Aws::String& value) { m_descriptionHasBeenSet = true; m_description = value; }
 
     /**
-     * <p>A customer-provided description of the role.</p>
+     * <p>A description of the role.</p>
      */
     inline void SetDescription(Aws::String&& value) { m_descriptionHasBeenSet = true; m_description = std::move(value); }
 
     /**
-     * <p>A customer-provided description of the role.</p>
+     * <p>A description of the role.</p>
      */
     inline void SetDescription(const char* value) { m_descriptionHasBeenSet = true; m_description.assign(value); }
 
     /**
-     * <p>A customer-provided description of the role.</p>
+     * <p>A description of the role.</p>
      */
     inline CreateRoleRequest& WithDescription(const Aws::String& value) { SetDescription(value); return *this;}
 
     /**
-     * <p>A customer-provided description of the role.</p>
+     * <p>A description of the role.</p>
      */
     inline CreateRoleRequest& WithDescription(Aws::String&& value) { SetDescription(std::move(value)); return *this;}
 
     /**
-     * <p>A customer-provided description of the role.</p>
+     * <p>A description of the role.</p>
      */
     inline CreateRoleRequest& WithDescription(const char* value) { SetDescription(value); return *this;}
 
+
+    /**
+     * <p>The maximum session duration (in seconds) that you want to set for the
+     * specified role. If you do not specify a value for this setting, the default
+     * maximum of one hour is applied. This setting can have a value from 1 hour to 12
+     * hours.</p> <p>Anyone who assumes the role from the AWS CLI or API can use the
+     * <code>DurationSeconds</code> API parameter or the <code>duration-seconds</code>
+     * CLI parameter to request a longer session. The <code>MaxSessionDuration</code>
+     * setting determines the maximum duration that can be requested using the
+     * <code>DurationSeconds</code> parameter. If users don't specify a value for the
+     * <code>DurationSeconds</code> parameter, their security credentials are valid for
+     * one hour by default. This applies when you use the <code>AssumeRole*</code> API
+     * operations or the <code>assume-role*</code> CLI operations but does not apply
+     * when you use those operations to create a console URL. For more information, see
+     * <a
+     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html">Using
+     * IAM Roles</a> in the <i>IAM User Guide</i>.</p>
+     */
+    inline int GetMaxSessionDuration() const{ return m_maxSessionDuration; }
+
+    /**
+     * <p>The maximum session duration (in seconds) that you want to set for the
+     * specified role. If you do not specify a value for this setting, the default
+     * maximum of one hour is applied. This setting can have a value from 1 hour to 12
+     * hours.</p> <p>Anyone who assumes the role from the AWS CLI or API can use the
+     * <code>DurationSeconds</code> API parameter or the <code>duration-seconds</code>
+     * CLI parameter to request a longer session. The <code>MaxSessionDuration</code>
+     * setting determines the maximum duration that can be requested using the
+     * <code>DurationSeconds</code> parameter. If users don't specify a value for the
+     * <code>DurationSeconds</code> parameter, their security credentials are valid for
+     * one hour by default. This applies when you use the <code>AssumeRole*</code> API
+     * operations or the <code>assume-role*</code> CLI operations but does not apply
+     * when you use those operations to create a console URL. For more information, see
+     * <a
+     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html">Using
+     * IAM Roles</a> in the <i>IAM User Guide</i>.</p>
+     */
+    inline void SetMaxSessionDuration(int value) { m_maxSessionDurationHasBeenSet = true; m_maxSessionDuration = value; }
+
+    /**
+     * <p>The maximum session duration (in seconds) that you want to set for the
+     * specified role. If you do not specify a value for this setting, the default
+     * maximum of one hour is applied. This setting can have a value from 1 hour to 12
+     * hours.</p> <p>Anyone who assumes the role from the AWS CLI or API can use the
+     * <code>DurationSeconds</code> API parameter or the <code>duration-seconds</code>
+     * CLI parameter to request a longer session. The <code>MaxSessionDuration</code>
+     * setting determines the maximum duration that can be requested using the
+     * <code>DurationSeconds</code> parameter. If users don't specify a value for the
+     * <code>DurationSeconds</code> parameter, their security credentials are valid for
+     * one hour by default. This applies when you use the <code>AssumeRole*</code> API
+     * operations or the <code>assume-role*</code> CLI operations but does not apply
+     * when you use those operations to create a console URL. For more information, see
+     * <a
+     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html">Using
+     * IAM Roles</a> in the <i>IAM User Guide</i>.</p>
+     */
+    inline CreateRoleRequest& WithMaxSessionDuration(int value) { SetMaxSessionDuration(value); return *this;}
+
   private:
 
     Aws::String m_path;
@@ -342,6 +407,9 @@ namespace Model
 
     Aws::String m_description;
     bool m_descriptionHasBeenSet;
+
+    int m_maxSessionDuration;
+    bool m_maxSessionDurationHasBeenSet;
   };
 
 } // namespace Model
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/CreateSAMLProviderRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/CreateSAMLProviderRequest.h
index 2655aea43ea..4ca9947dd5b 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/CreateSAMLProviderRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/CreateSAMLProviderRequest.h
@@ -135,7 +135,7 @@ namespace Model
      * <p>The name of the provider to create.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetName() const{ return m_name; }
 
@@ -143,7 +143,7 @@ namespace Model
      * <p>The name of the provider to create.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetName(const Aws::String& value) { m_nameHasBeenSet = true; m_name = value; }
 
@@ -151,7 +151,7 @@ namespace Model
      * <p>The name of the provider to create.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetName(Aws::String&& value) { m_nameHasBeenSet = true; m_name = std::move(value); }
 
@@ -159,7 +159,7 @@ namespace Model
      * <p>The name of the provider to create.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetName(const char* value) { m_nameHasBeenSet = true; m_name.assign(value); }
 
@@ -167,7 +167,7 @@ namespace Model
      * <p>The name of the provider to create.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline CreateSAMLProviderRequest& WithName(const Aws::String& value) { SetName(value); return *this;}
 
@@ -175,7 +175,7 @@ namespace Model
      * <p>The name of the provider to create.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline CreateSAMLProviderRequest& WithName(Aws::String&& value) { SetName(std::move(value)); return *this;}
 
@@ -183,7 +183,7 @@ namespace Model
      * <p>The name of the provider to create.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline CreateSAMLProviderRequest& WithName(const char* value) { SetName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/CreateServiceSpecificCredentialRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/CreateServiceSpecificCredentialRequest.h
index 92c5754ea5f..002aceee108 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/CreateServiceSpecificCredentialRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/CreateServiceSpecificCredentialRequest.h
@@ -53,7 +53,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -64,7 +64,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -75,7 +75,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -86,7 +86,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -97,7 +97,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline CreateServiceSpecificCredentialRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -108,7 +108,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline CreateServiceSpecificCredentialRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -119,7 +119,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline CreateServiceSpecificCredentialRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/CreateUserRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/CreateUserRequest.h
index fd57fe6a0f7..1eda3a8cfe8 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/CreateUserRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/CreateUserRequest.h
@@ -50,12 +50,13 @@ namespace Model
      * <p> The path for the user name. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline const Aws::String& GetPath() const{ return m_path; }
 
@@ -63,12 +64,13 @@ namespace Model
      * <p> The path for the user name. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline void SetPath(const Aws::String& value) { m_pathHasBeenSet = true; m_path = value; }
 
@@ -76,12 +78,13 @@ namespace Model
      * <p> The path for the user name. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline void SetPath(Aws::String&& value) { m_pathHasBeenSet = true; m_path = std::move(value); }
 
@@ -89,12 +92,13 @@ namespace Model
      * <p> The path for the user name. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline void SetPath(const char* value) { m_pathHasBeenSet = true; m_path.assign(value); }
 
@@ -102,12 +106,13 @@ namespace Model
      * <p> The path for the user name. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline CreateUserRequest& WithPath(const Aws::String& value) { SetPath(value); return *this;}
 
@@ -115,12 +120,13 @@ namespace Model
      * <p> The path for the user name. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline CreateUserRequest& WithPath(Aws::String&& value) { SetPath(std::move(value)); return *this;}
 
@@ -128,12 +134,13 @@ namespace Model
      * <p> The path for the user name. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline CreateUserRequest& WithPath(const char* value) { SetPath(value); return *this;}
 
@@ -142,7 +149,7 @@ namespace Model
      * <p>The name of the user to create.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-. User names are not
+     * can also include any of the following characters: _+=,.@-. User names are not
      * distinguished by case. For example, you cannot create users named both
      * "TESTUSER" and "testuser".</p>
      */
@@ -152,7 +159,7 @@ namespace Model
      * <p>The name of the user to create.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-. User names are not
+     * can also include any of the following characters: _+=,.@-. User names are not
      * distinguished by case. For example, you cannot create users named both
      * "TESTUSER" and "testuser".</p>
      */
@@ -162,7 +169,7 @@ namespace Model
      * <p>The name of the user to create.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-. User names are not
+     * can also include any of the following characters: _+=,.@-. User names are not
      * distinguished by case. For example, you cannot create users named both
      * "TESTUSER" and "testuser".</p>
      */
@@ -172,7 +179,7 @@ namespace Model
      * <p>The name of the user to create.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-. User names are not
+     * can also include any of the following characters: _+=,.@-. User names are not
      * distinguished by case. For example, you cannot create users named both
      * "TESTUSER" and "testuser".</p>
      */
@@ -182,7 +189,7 @@ namespace Model
      * <p>The name of the user to create.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-. User names are not
+     * can also include any of the following characters: _+=,.@-. User names are not
      * distinguished by case. For example, you cannot create users named both
      * "TESTUSER" and "testuser".</p>
      */
@@ -192,7 +199,7 @@ namespace Model
      * <p>The name of the user to create.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-. User names are not
+     * can also include any of the following characters: _+=,.@-. User names are not
      * distinguished by case. For example, you cannot create users named both
      * "TESTUSER" and "testuser".</p>
      */
@@ -202,7 +209,7 @@ namespace Model
      * <p>The name of the user to create.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-. User names are not
+     * can also include any of the following characters: _+=,.@-. User names are not
      * distinguished by case. For example, you cannot create users named both
      * "TESTUSER" and "testuser".</p>
      */
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/CreateVirtualMFADeviceRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/CreateVirtualMFADeviceRequest.h
index 712a4c7f121..fe8752790d4 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/CreateVirtualMFADeviceRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/CreateVirtualMFADeviceRequest.h
@@ -51,12 +51,13 @@ namespace Model
      * <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline const Aws::String& GetPath() const{ return m_path; }
 
@@ -65,12 +66,13 @@ namespace Model
      * <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline void SetPath(const Aws::String& value) { m_pathHasBeenSet = true; m_path = value; }
 
@@ -79,12 +81,13 @@ namespace Model
      * <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline void SetPath(Aws::String&& value) { m_pathHasBeenSet = true; m_path = std::move(value); }
 
@@ -93,12 +96,13 @@ namespace Model
      * <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline void SetPath(const char* value) { m_pathHasBeenSet = true; m_path.assign(value); }
 
@@ -107,12 +111,13 @@ namespace Model
      * <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline CreateVirtualMFADeviceRequest& WithPath(const Aws::String& value) { SetPath(value); return *this;}
 
@@ -121,12 +126,13 @@ namespace Model
      * <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline CreateVirtualMFADeviceRequest& WithPath(Aws::String&& value) { SetPath(std::move(value)); return *this;}
 
@@ -135,12 +141,13 @@ namespace Model
      * <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/).</p> <p>This paramater allows
+     * If it is not included, it defaults to a slash (/).</p> <p>This parameter allows
      * (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string
      * of characters consisting of either a forward slash (/) by itself or a string
-     * that must begin and end with forward slashes, containing any ASCII character
-     * from the ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p>
+     * that must begin and end with forward slashes. In addition, it can contain any
+     * ASCII character from the ! (\u0021) through the DEL character (\u007F),
+     * including most punctuation characters, digits, and upper and lowercased
+     * letters.</p>
      */
     inline CreateVirtualMFADeviceRequest& WithPath(const char* value) { SetPath(value); return *this;}
 
@@ -150,7 +157,7 @@ namespace Model
      * virtual MFA device.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetVirtualMFADeviceName() const{ return m_virtualMFADeviceName; }
 
@@ -159,7 +166,7 @@ namespace Model
      * virtual MFA device.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetVirtualMFADeviceName(const Aws::String& value) { m_virtualMFADeviceNameHasBeenSet = true; m_virtualMFADeviceName = value; }
 
@@ -168,7 +175,7 @@ namespace Model
      * virtual MFA device.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetVirtualMFADeviceName(Aws::String&& value) { m_virtualMFADeviceNameHasBeenSet = true; m_virtualMFADeviceName = std::move(value); }
 
@@ -177,7 +184,7 @@ namespace Model
      * virtual MFA device.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetVirtualMFADeviceName(const char* value) { m_virtualMFADeviceNameHasBeenSet = true; m_virtualMFADeviceName.assign(value); }
 
@@ -186,7 +193,7 @@ namespace Model
      * virtual MFA device.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline CreateVirtualMFADeviceRequest& WithVirtualMFADeviceName(const Aws::String& value) { SetVirtualMFADeviceName(value); return *this;}
 
@@ -195,7 +202,7 @@ namespace Model
      * virtual MFA device.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline CreateVirtualMFADeviceRequest& WithVirtualMFADeviceName(Aws::String&& value) { SetVirtualMFADeviceName(std::move(value)); return *this;}
 
@@ -204,7 +211,7 @@ namespace Model
      * virtual MFA device.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline CreateVirtualMFADeviceRequest& WithVirtualMFADeviceName(const char* value) { SetVirtualMFADeviceName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/DeactivateMFADeviceRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/DeactivateMFADeviceRequest.h
index 02a5540b7d1..0625e144991 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/DeactivateMFADeviceRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/DeactivateMFADeviceRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline DeactivateMFADeviceRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline DeactivateMFADeviceRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline DeactivateMFADeviceRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteAccessKeyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteAccessKeyRequest.h
index 0e78fded914..c86a0473a82 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteAccessKeyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteAccessKeyRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline DeleteAccessKeyRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline DeleteAccessKeyRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline DeleteAccessKeyRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteGroupPolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteGroupPolicyRequest.h
index 7fd2cecb7a7..84b1b5a5f91 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteGroupPolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteGroupPolicyRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * embedded in.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetGroupName() const{ return m_groupName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * embedded in.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const Aws::String& value) { m_groupNameHasBeenSet = true; m_groupName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * embedded in.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(Aws::String&& value) { m_groupNameHasBeenSet = true; m_groupName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * embedded in.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const char* value) { m_groupNameHasBeenSet = true; m_groupName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * embedded in.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteGroupPolicyRequest& WithGroupName(const Aws::String& value) { SetGroupName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * embedded in.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteGroupPolicyRequest& WithGroupName(Aws::String&& value) { SetGroupName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * embedded in.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteGroupPolicyRequest& WithGroupName(const char* value) { SetGroupName(value); return *this;}
 
@@ -114,7 +114,8 @@ namespace Model
      * <p>The name identifying the policy document to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-+</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline const Aws::String& GetPolicyName() const{ return m_policyName; }
 
@@ -122,7 +123,8 @@ namespace Model
      * <p>The name identifying the policy document to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-+</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetPolicyName(const Aws::String& value) { m_policyNameHasBeenSet = true; m_policyName = value; }
 
@@ -130,7 +132,8 @@ namespace Model
      * <p>The name identifying the policy document to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-+</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetPolicyName(Aws::String&& value) { m_policyNameHasBeenSet = true; m_policyName = std::move(value); }
 
@@ -138,7 +141,8 @@ namespace Model
      * <p>The name identifying the policy document to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-+</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetPolicyName(const char* value) { m_policyNameHasBeenSet = true; m_policyName.assign(value); }
 
@@ -146,7 +150,8 @@ namespace Model
      * <p>The name identifying the policy document to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-+</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline DeleteGroupPolicyRequest& WithPolicyName(const Aws::String& value) { SetPolicyName(value); return *this;}
 
@@ -154,7 +159,8 @@ namespace Model
      * <p>The name identifying the policy document to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-+</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline DeleteGroupPolicyRequest& WithPolicyName(Aws::String&& value) { SetPolicyName(std::move(value)); return *this;}
 
@@ -162,7 +168,8 @@ namespace Model
      * <p>The name identifying the policy document to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-+</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline DeleteGroupPolicyRequest& WithPolicyName(const char* value) { SetPolicyName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteGroupRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteGroupRequest.h
index cabb60fc182..abeeee24c8f 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteGroupRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteGroupRequest.h
@@ -50,7 +50,7 @@ namespace Model
      * <p>The name of the IAM group to delete.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetGroupName() const{ return m_groupName; }
 
@@ -58,7 +58,7 @@ namespace Model
      * <p>The name of the IAM group to delete.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const Aws::String& value) { m_groupNameHasBeenSet = true; m_groupName = value; }
 
@@ -66,7 +66,7 @@ namespace Model
      * <p>The name of the IAM group to delete.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(Aws::String&& value) { m_groupNameHasBeenSet = true; m_groupName = std::move(value); }
 
@@ -74,7 +74,7 @@ namespace Model
      * <p>The name of the IAM group to delete.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const char* value) { m_groupNameHasBeenSet = true; m_groupName.assign(value); }
 
@@ -82,7 +82,7 @@ namespace Model
      * <p>The name of the IAM group to delete.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteGroupRequest& WithGroupName(const Aws::String& value) { SetGroupName(value); return *this;}
 
@@ -90,7 +90,7 @@ namespace Model
      * <p>The name of the IAM group to delete.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteGroupRequest& WithGroupName(Aws::String&& value) { SetGroupName(std::move(value)); return *this;}
 
@@ -98,7 +98,7 @@ namespace Model
      * <p>The name of the IAM group to delete.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteGroupRequest& WithGroupName(const char* value) { SetGroupName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteInstanceProfileRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteInstanceProfileRequest.h
index e4d57a1d33f..2dbcd6a17a3 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteInstanceProfileRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteInstanceProfileRequest.h
@@ -50,7 +50,7 @@ namespace Model
      * <p>The name of the instance profile to delete.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetInstanceProfileName() const{ return m_instanceProfileName; }
 
@@ -58,7 +58,7 @@ namespace Model
      * <p>The name of the instance profile to delete.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetInstanceProfileName(const Aws::String& value) { m_instanceProfileNameHasBeenSet = true; m_instanceProfileName = value; }
 
@@ -66,7 +66,7 @@ namespace Model
      * <p>The name of the instance profile to delete.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetInstanceProfileName(Aws::String&& value) { m_instanceProfileNameHasBeenSet = true; m_instanceProfileName = std::move(value); }
 
@@ -74,7 +74,7 @@ namespace Model
      * <p>The name of the instance profile to delete.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetInstanceProfileName(const char* value) { m_instanceProfileNameHasBeenSet = true; m_instanceProfileName.assign(value); }
 
@@ -82,7 +82,7 @@ namespace Model
      * <p>The name of the instance profile to delete.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteInstanceProfileRequest& WithInstanceProfileName(const Aws::String& value) { SetInstanceProfileName(value); return *this;}
 
@@ -90,7 +90,7 @@ namespace Model
      * <p>The name of the instance profile to delete.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteInstanceProfileRequest& WithInstanceProfileName(Aws::String&& value) { SetInstanceProfileName(std::move(value)); return *this;}
 
@@ -98,7 +98,7 @@ namespace Model
      * <p>The name of the instance profile to delete.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteInstanceProfileRequest& WithInstanceProfileName(const char* value) { SetInstanceProfileName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteLoginProfileRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteLoginProfileRequest.h
index bfe7789d2e9..593291846e2 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteLoginProfileRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteLoginProfileRequest.h
@@ -50,7 +50,8 @@ namespace Model
      * <p>The name of the user whose password you want to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -58,7 +59,8 @@ namespace Model
      * <p>The name of the user whose password you want to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -66,7 +68,8 @@ namespace Model
      * <p>The name of the user whose password you want to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -74,7 +77,8 @@ namespace Model
      * <p>The name of the user whose password you want to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -82,7 +86,8 @@ namespace Model
      * <p>The name of the user whose password you want to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline DeleteLoginProfileRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -90,7 +95,8 @@ namespace Model
      * <p>The name of the user whose password you want to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline DeleteLoginProfileRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -98,7 +104,8 @@ namespace Model
      * <p>The name of the user whose password you want to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline DeleteLoginProfileRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteOpenIDConnectProviderRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteOpenIDConnectProviderRequest.h
index 6d18e0ea736..28302048b62 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteOpenIDConnectProviderRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteOpenIDConnectProviderRequest.h
@@ -49,49 +49,49 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OpenID Connect provider resource
      * object to delete. You can get a list of OpenID Connect provider resource ARNs by
-     * using the <a>ListOpenIDConnectProviders</a> action.</p>
+     * using the <a>ListOpenIDConnectProviders</a> operation.</p>
      */
     inline const Aws::String& GetOpenIDConnectProviderArn() const{ return m_openIDConnectProviderArn; }
 
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OpenID Connect provider resource
      * object to delete. You can get a list of OpenID Connect provider resource ARNs by
-     * using the <a>ListOpenIDConnectProviders</a> action.</p>
+     * using the <a>ListOpenIDConnectProviders</a> operation.</p>
      */
     inline void SetOpenIDConnectProviderArn(const Aws::String& value) { m_openIDConnectProviderArnHasBeenSet = true; m_openIDConnectProviderArn = value; }
 
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OpenID Connect provider resource
      * object to delete. You can get a list of OpenID Connect provider resource ARNs by
-     * using the <a>ListOpenIDConnectProviders</a> action.</p>
+     * using the <a>ListOpenIDConnectProviders</a> operation.</p>
      */
     inline void SetOpenIDConnectProviderArn(Aws::String&& value) { m_openIDConnectProviderArnHasBeenSet = true; m_openIDConnectProviderArn = std::move(value); }
 
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OpenID Connect provider resource
      * object to delete. You can get a list of OpenID Connect provider resource ARNs by
-     * using the <a>ListOpenIDConnectProviders</a> action.</p>
+     * using the <a>ListOpenIDConnectProviders</a> operation.</p>
      */
     inline void SetOpenIDConnectProviderArn(const char* value) { m_openIDConnectProviderArnHasBeenSet = true; m_openIDConnectProviderArn.assign(value); }
 
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OpenID Connect provider resource
      * object to delete. You can get a list of OpenID Connect provider resource ARNs by
-     * using the <a>ListOpenIDConnectProviders</a> action.</p>
+     * using the <a>ListOpenIDConnectProviders</a> operation.</p>
      */
     inline DeleteOpenIDConnectProviderRequest& WithOpenIDConnectProviderArn(const Aws::String& value) { SetOpenIDConnectProviderArn(value); return *this;}
 
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OpenID Connect provider resource
      * object to delete. You can get a list of OpenID Connect provider resource ARNs by
-     * using the <a>ListOpenIDConnectProviders</a> action.</p>
+     * using the <a>ListOpenIDConnectProviders</a> operation.</p>
      */
     inline DeleteOpenIDConnectProviderRequest& WithOpenIDConnectProviderArn(Aws::String&& value) { SetOpenIDConnectProviderArn(std::move(value)); return *this;}
 
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OpenID Connect provider resource
      * object to delete. You can get a list of OpenID Connect provider resource ARNs by
-     * using the <a>ListOpenIDConnectProviders</a> action.</p>
+     * using the <a>ListOpenIDConnectProviders</a> operation.</p>
      */
     inline DeleteOpenIDConnectProviderRequest& WithOpenIDConnectProviderArn(const char* value) { SetOpenIDConnectProviderArn(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteRolePolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteRolePolicyRequest.h
index ae9c4d59b37..9951bf854ba 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteRolePolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteRolePolicyRequest.h
@@ -115,7 +115,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetPolicyName() const{ return m_policyName; }
 
@@ -124,7 +124,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(const Aws::String& value) { m_policyNameHasBeenSet = true; m_policyName = value; }
 
@@ -133,7 +133,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(Aws::String&& value) { m_policyNameHasBeenSet = true; m_policyName = std::move(value); }
 
@@ -142,7 +142,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(const char* value) { m_policyNameHasBeenSet = true; m_policyName.assign(value); }
 
@@ -151,7 +151,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteRolePolicyRequest& WithPolicyName(const Aws::String& value) { SetPolicyName(value); return *this;}
 
@@ -160,7 +160,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteRolePolicyRequest& WithPolicyName(Aws::String&& value) { SetPolicyName(std::move(value)); return *this;}
 
@@ -169,7 +169,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteRolePolicyRequest& WithPolicyName(const char* value) { SetPolicyName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteSSHPublicKeyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteSSHPublicKeyRequest.h
index 82e71342e6c..d1b857db42a 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteSSHPublicKeyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteSSHPublicKeyRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline DeleteSSHPublicKeyRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline DeleteSSHPublicKeyRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline DeleteSSHPublicKeyRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteServerCertificateRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteServerCertificateRequest.h
index 04cc47b955c..7cd9bc33909 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteServerCertificateRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteServerCertificateRequest.h
@@ -50,7 +50,8 @@ namespace Model
      * <p>The name of the server certificate you want to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline const Aws::String& GetServerCertificateName() const{ return m_serverCertificateName; }
 
@@ -58,7 +59,8 @@ namespace Model
      * <p>The name of the server certificate you want to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetServerCertificateName(const Aws::String& value) { m_serverCertificateNameHasBeenSet = true; m_serverCertificateName = value; }
 
@@ -66,7 +68,8 @@ namespace Model
      * <p>The name of the server certificate you want to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetServerCertificateName(Aws::String&& value) { m_serverCertificateNameHasBeenSet = true; m_serverCertificateName = std::move(value); }
 
@@ -74,7 +77,8 @@ namespace Model
      * <p>The name of the server certificate you want to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetServerCertificateName(const char* value) { m_serverCertificateNameHasBeenSet = true; m_serverCertificateName.assign(value); }
 
@@ -82,7 +86,8 @@ namespace Model
      * <p>The name of the server certificate you want to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline DeleteServerCertificateRequest& WithServerCertificateName(const Aws::String& value) { SetServerCertificateName(value); return *this;}
 
@@ -90,7 +95,8 @@ namespace Model
      * <p>The name of the server certificate you want to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline DeleteServerCertificateRequest& WithServerCertificateName(Aws::String&& value) { SetServerCertificateName(std::move(value)); return *this;}
 
@@ -98,7 +104,8 @@ namespace Model
      * <p>The name of the server certificate you want to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline DeleteServerCertificateRequest& WithServerCertificateName(const char* value) { SetServerCertificateName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteServiceSpecificCredentialRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteServiceSpecificCredentialRequest.h
index 62531bf69be..2260603d5d5 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteServiceSpecificCredentialRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteServiceSpecificCredentialRequest.h
@@ -52,7 +52,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -62,7 +62,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -72,7 +72,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -82,7 +82,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -92,7 +92,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteServiceSpecificCredentialRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -102,7 +102,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteServiceSpecificCredentialRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -112,7 +112,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteServiceSpecificCredentialRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteSigningCertificateRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteSigningCertificateRequest.h
index 0902ef0f698..0016706ce58 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteSigningCertificateRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteSigningCertificateRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline DeleteSigningCertificateRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline DeleteSigningCertificateRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline DeleteSigningCertificateRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteUserPolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteUserPolicyRequest.h
index 5e722dd74eb..59e6b0a7f85 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteUserPolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteUserPolicyRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * embedded in.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * embedded in.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * embedded in.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * embedded in.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * embedded in.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteUserPolicyRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * embedded in.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteUserPolicyRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * embedded in.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteUserPolicyRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
@@ -114,7 +114,8 @@ namespace Model
      * <p>The name identifying the policy document to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-+</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline const Aws::String& GetPolicyName() const{ return m_policyName; }
 
@@ -122,7 +123,8 @@ namespace Model
      * <p>The name identifying the policy document to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-+</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetPolicyName(const Aws::String& value) { m_policyNameHasBeenSet = true; m_policyName = value; }
 
@@ -130,7 +132,8 @@ namespace Model
      * <p>The name identifying the policy document to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-+</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetPolicyName(Aws::String&& value) { m_policyNameHasBeenSet = true; m_policyName = std::move(value); }
 
@@ -138,7 +141,8 @@ namespace Model
      * <p>The name identifying the policy document to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-+</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetPolicyName(const char* value) { m_policyNameHasBeenSet = true; m_policyName.assign(value); }
 
@@ -146,7 +150,8 @@ namespace Model
      * <p>The name identifying the policy document to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-+</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline DeleteUserPolicyRequest& WithPolicyName(const Aws::String& value) { SetPolicyName(value); return *this;}
 
@@ -154,7 +159,8 @@ namespace Model
      * <p>The name identifying the policy document to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-+</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline DeleteUserPolicyRequest& WithPolicyName(Aws::String&& value) { SetPolicyName(std::move(value)); return *this;}
 
@@ -162,7 +168,8 @@ namespace Model
      * <p>The name identifying the policy document to delete.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-+</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline DeleteUserPolicyRequest& WithPolicyName(const char* value) { SetPolicyName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteUserRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteUserRequest.h
index 76cb218062b..3880ac736c8 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/DeleteUserRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/DeleteUserRequest.h
@@ -50,7 +50,7 @@ namespace Model
      * <p>The name of the user to delete.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -58,7 +58,7 @@ namespace Model
      * <p>The name of the user to delete.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -66,7 +66,7 @@ namespace Model
      * <p>The name of the user to delete.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -74,7 +74,7 @@ namespace Model
      * <p>The name of the user to delete.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -82,7 +82,7 @@ namespace Model
      * <p>The name of the user to delete.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteUserRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -90,7 +90,7 @@ namespace Model
      * <p>The name of the user to delete.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteUserRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -98,7 +98,7 @@ namespace Model
      * <p>The name of the user to delete.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DeleteUserRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/DeletionTaskFailureReasonType.h b/aws-cpp-sdk-iam/include/aws/iam/model/DeletionTaskFailureReasonType.h
index 016b4824a9e..3568669d13b 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/DeletionTaskFailureReasonType.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/DeletionTaskFailureReasonType.h
@@ -99,71 +99,71 @@ namespace Model
 
     /**
      * <p>A list of objects that contains details about the service-linked role
-     * deletion failure. If the service-linked role has active sessions or if any
-     * resources that were used by the role have not been deleted from the linked
-     * service, the role can't be deleted. This parameter includes a list of the
-     * resources that are associated with the role and the region in which the
-     * resources are being used.</p>
+     * deletion failure, if that information is returned by the service. If the
+     * service-linked role has active sessions or if any resources that were used by
+     * the role have not been deleted from the linked service, the role can't be
+     * deleted. This parameter includes a list of the resources that are associated
+     * with the role and the region in which the resources are being used.</p>
      */
     inline const Aws::Vector<RoleUsageType>& GetRoleUsageList() const{ return m_roleUsageList; }
 
     /**
      * <p>A list of objects that contains details about the service-linked role
-     * deletion failure. If the service-linked role has active sessions or if any
-     * resources that were used by the role have not been deleted from the linked
-     * service, the role can't be deleted. This parameter includes a list of the
-     * resources that are associated with the role and the region in which the
-     * resources are being used.</p>
+     * deletion failure, if that information is returned by the service. If the
+     * service-linked role has active sessions or if any resources that were used by
+     * the role have not been deleted from the linked service, the role can't be
+     * deleted. This parameter includes a list of the resources that are associated
+     * with the role and the region in which the resources are being used.</p>
      */
     inline void SetRoleUsageList(const Aws::Vector<RoleUsageType>& value) { m_roleUsageListHasBeenSet = true; m_roleUsageList = value; }
 
     /**
      * <p>A list of objects that contains details about the service-linked role
-     * deletion failure. If the service-linked role has active sessions or if any
-     * resources that were used by the role have not been deleted from the linked
-     * service, the role can't be deleted. This parameter includes a list of the
-     * resources that are associated with the role and the region in which the
-     * resources are being used.</p>
+     * deletion failure, if that information is returned by the service. If the
+     * service-linked role has active sessions or if any resources that were used by
+     * the role have not been deleted from the linked service, the role can't be
+     * deleted. This parameter includes a list of the resources that are associated
+     * with the role and the region in which the resources are being used.</p>
      */
     inline void SetRoleUsageList(Aws::Vector<RoleUsageType>&& value) { m_roleUsageListHasBeenSet = true; m_roleUsageList = std::move(value); }
 
     /**
      * <p>A list of objects that contains details about the service-linked role
-     * deletion failure. If the service-linked role has active sessions or if any
-     * resources that were used by the role have not been deleted from the linked
-     * service, the role can't be deleted. This parameter includes a list of the
-     * resources that are associated with the role and the region in which the
-     * resources are being used.</p>
+     * deletion failure, if that information is returned by the service. If the
+     * service-linked role has active sessions or if any resources that were used by
+     * the role have not been deleted from the linked service, the role can't be
+     * deleted. This parameter includes a list of the resources that are associated
+     * with the role and the region in which the resources are being used.</p>
      */
     inline DeletionTaskFailureReasonType& WithRoleUsageList(const Aws::Vector<RoleUsageType>& value) { SetRoleUsageList(value); return *this;}
 
     /**
      * <p>A list of objects that contains details about the service-linked role
-     * deletion failure. If the service-linked role has active sessions or if any
-     * resources that were used by the role have not been deleted from the linked
-     * service, the role can't be deleted. This parameter includes a list of the
-     * resources that are associated with the role and the region in which the
-     * resources are being used.</p>
+     * deletion failure, if that information is returned by the service. If the
+     * service-linked role has active sessions or if any resources that were used by
+     * the role have not been deleted from the linked service, the role can't be
+     * deleted. This parameter includes a list of the resources that are associated
+     * with the role and the region in which the resources are being used.</p>
      */
     inline DeletionTaskFailureReasonType& WithRoleUsageList(Aws::Vector<RoleUsageType>&& value) { SetRoleUsageList(std::move(value)); return *this;}
 
     /**
      * <p>A list of objects that contains details about the service-linked role
-     * deletion failure. If the service-linked role has active sessions or if any
-     * resources that were used by the role have not been deleted from the linked
-     * service, the role can't be deleted. This parameter includes a list of the
-     * resources that are associated with the role and the region in which the
-     * resources are being used.</p>
+     * deletion failure, if that information is returned by the service. If the
+     * service-linked role has active sessions or if any resources that were used by
+     * the role have not been deleted from the linked service, the role can't be
+     * deleted. This parameter includes a list of the resources that are associated
+     * with the role and the region in which the resources are being used.</p>
      */
     inline DeletionTaskFailureReasonType& AddRoleUsageList(const RoleUsageType& value) { m_roleUsageListHasBeenSet = true; m_roleUsageList.push_back(value); return *this; }
 
     /**
      * <p>A list of objects that contains details about the service-linked role
-     * deletion failure. If the service-linked role has active sessions or if any
-     * resources that were used by the role have not been deleted from the linked
-     * service, the role can't be deleted. This parameter includes a list of the
-     * resources that are associated with the role and the region in which the
-     * resources are being used.</p>
+     * deletion failure, if that information is returned by the service. If the
+     * service-linked role has active sessions or if any resources that were used by
+     * the role have not been deleted from the linked service, the role can't be
+     * deleted. This parameter includes a list of the resources that are associated
+     * with the role and the region in which the resources are being used.</p>
      */
     inline DeletionTaskFailureReasonType& AddRoleUsageList(RoleUsageType&& value) { m_roleUsageListHasBeenSet = true; m_roleUsageList.push_back(std::move(value)); return *this; }
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/DetachGroupPolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/DetachGroupPolicyRequest.h
index c59f943e655..06621763ded 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/DetachGroupPolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/DetachGroupPolicyRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * from.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetGroupName() const{ return m_groupName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * from.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const Aws::String& value) { m_groupNameHasBeenSet = true; m_groupName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * from.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(Aws::String&& value) { m_groupNameHasBeenSet = true; m_groupName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * from.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const char* value) { m_groupNameHasBeenSet = true; m_groupName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * from.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DetachGroupPolicyRequest& WithGroupName(const Aws::String& value) { SetGroupName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * from.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DetachGroupPolicyRequest& WithGroupName(Aws::String&& value) { SetGroupName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * from.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DetachGroupPolicyRequest& WithGroupName(const char* value) { SetGroupName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/DetachUserPolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/DetachUserPolicyRequest.h
index 646f807e043..26c6af822c0 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/DetachUserPolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/DetachUserPolicyRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * from.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * from.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * from.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * from.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * from.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DetachUserPolicyRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * from.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DetachUserPolicyRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * from.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline DetachUserPolicyRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/EnableMFADeviceRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/EnableMFADeviceRequest.h
index 536cbd9d047..b40721b2e26 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/EnableMFADeviceRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/EnableMFADeviceRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline EnableMFADeviceRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline EnableMFADeviceRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline EnableMFADeviceRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
@@ -176,7 +176,7 @@ namespace Model
 
     /**
      * <p>An authentication code emitted by the device. </p> <p>The format for this
-     * parameter is a string of 6 digits.</p> <important> <p>Submit your request
+     * parameter is a string of six digits.</p> <important> <p>Submit your request
      * immediately after generating the authentication codes. If you generate the codes
      * and then wait too long to submit the request, the MFA device successfully
      * associates with the user but the MFA device becomes out of sync. This happens
@@ -189,7 +189,7 @@ namespace Model
 
     /**
      * <p>An authentication code emitted by the device. </p> <p>The format for this
-     * parameter is a string of 6 digits.</p> <important> <p>Submit your request
+     * parameter is a string of six digits.</p> <important> <p>Submit your request
      * immediately after generating the authentication codes. If you generate the codes
      * and then wait too long to submit the request, the MFA device successfully
      * associates with the user but the MFA device becomes out of sync. This happens
@@ -202,7 +202,7 @@ namespace Model
 
     /**
      * <p>An authentication code emitted by the device. </p> <p>The format for this
-     * parameter is a string of 6 digits.</p> <important> <p>Submit your request
+     * parameter is a string of six digits.</p> <important> <p>Submit your request
      * immediately after generating the authentication codes. If you generate the codes
      * and then wait too long to submit the request, the MFA device successfully
      * associates with the user but the MFA device becomes out of sync. This happens
@@ -215,7 +215,7 @@ namespace Model
 
     /**
      * <p>An authentication code emitted by the device. </p> <p>The format for this
-     * parameter is a string of 6 digits.</p> <important> <p>Submit your request
+     * parameter is a string of six digits.</p> <important> <p>Submit your request
      * immediately after generating the authentication codes. If you generate the codes
      * and then wait too long to submit the request, the MFA device successfully
      * associates with the user but the MFA device becomes out of sync. This happens
@@ -228,7 +228,7 @@ namespace Model
 
     /**
      * <p>An authentication code emitted by the device. </p> <p>The format for this
-     * parameter is a string of 6 digits.</p> <important> <p>Submit your request
+     * parameter is a string of six digits.</p> <important> <p>Submit your request
      * immediately after generating the authentication codes. If you generate the codes
      * and then wait too long to submit the request, the MFA device successfully
      * associates with the user but the MFA device becomes out of sync. This happens
@@ -241,7 +241,7 @@ namespace Model
 
     /**
      * <p>An authentication code emitted by the device. </p> <p>The format for this
-     * parameter is a string of 6 digits.</p> <important> <p>Submit your request
+     * parameter is a string of six digits.</p> <important> <p>Submit your request
      * immediately after generating the authentication codes. If you generate the codes
      * and then wait too long to submit the request, the MFA device successfully
      * associates with the user but the MFA device becomes out of sync. This happens
@@ -254,7 +254,7 @@ namespace Model
 
     /**
      * <p>An authentication code emitted by the device. </p> <p>The format for this
-     * parameter is a string of 6 digits.</p> <important> <p>Submit your request
+     * parameter is a string of six digits.</p> <important> <p>Submit your request
      * immediately after generating the authentication codes. If you generate the codes
      * and then wait too long to submit the request, the MFA device successfully
      * associates with the user but the MFA device becomes out of sync. This happens
@@ -268,7 +268,7 @@ namespace Model
 
     /**
      * <p>A subsequent authentication code emitted by the device.</p> <p>The format for
-     * this parameter is a string of 6 digits.</p> <important> <p>Submit your request
+     * this parameter is a string of six digits.</p> <important> <p>Submit your request
      * immediately after generating the authentication codes. If you generate the codes
      * and then wait too long to submit the request, the MFA device successfully
      * associates with the user but the MFA device becomes out of sync. This happens
@@ -281,7 +281,7 @@ namespace Model
 
     /**
      * <p>A subsequent authentication code emitted by the device.</p> <p>The format for
-     * this parameter is a string of 6 digits.</p> <important> <p>Submit your request
+     * this parameter is a string of six digits.</p> <important> <p>Submit your request
      * immediately after generating the authentication codes. If you generate the codes
      * and then wait too long to submit the request, the MFA device successfully
      * associates with the user but the MFA device becomes out of sync. This happens
@@ -294,7 +294,7 @@ namespace Model
 
     /**
      * <p>A subsequent authentication code emitted by the device.</p> <p>The format for
-     * this parameter is a string of 6 digits.</p> <important> <p>Submit your request
+     * this parameter is a string of six digits.</p> <important> <p>Submit your request
      * immediately after generating the authentication codes. If you generate the codes
      * and then wait too long to submit the request, the MFA device successfully
      * associates with the user but the MFA device becomes out of sync. This happens
@@ -307,7 +307,7 @@ namespace Model
 
     /**
      * <p>A subsequent authentication code emitted by the device.</p> <p>The format for
-     * this parameter is a string of 6 digits.</p> <important> <p>Submit your request
+     * this parameter is a string of six digits.</p> <important> <p>Submit your request
      * immediately after generating the authentication codes. If you generate the codes
      * and then wait too long to submit the request, the MFA device successfully
      * associates with the user but the MFA device becomes out of sync. This happens
@@ -320,7 +320,7 @@ namespace Model
 
     /**
      * <p>A subsequent authentication code emitted by the device.</p> <p>The format for
-     * this parameter is a string of 6 digits.</p> <important> <p>Submit your request
+     * this parameter is a string of six digits.</p> <important> <p>Submit your request
      * immediately after generating the authentication codes. If you generate the codes
      * and then wait too long to submit the request, the MFA device successfully
      * associates with the user but the MFA device becomes out of sync. This happens
@@ -333,7 +333,7 @@ namespace Model
 
     /**
      * <p>A subsequent authentication code emitted by the device.</p> <p>The format for
-     * this parameter is a string of 6 digits.</p> <important> <p>Submit your request
+     * this parameter is a string of six digits.</p> <important> <p>Submit your request
      * immediately after generating the authentication codes. If you generate the codes
      * and then wait too long to submit the request, the MFA device successfully
      * associates with the user but the MFA device becomes out of sync. This happens
@@ -346,7 +346,7 @@ namespace Model
 
     /**
      * <p>A subsequent authentication code emitted by the device.</p> <p>The format for
-     * this parameter is a string of 6 digits.</p> <important> <p>Submit your request
+     * this parameter is a string of six digits.</p> <important> <p>Submit your request
      * immediately after generating the authentication codes. If you generate the codes
      * and then wait too long to submit the request, the MFA device successfully
      * associates with the user but the MFA device becomes out of sync. This happens
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/EvaluationResult.h b/aws-cpp-sdk-iam/include/aws/iam/model/EvaluationResult.h
index d9896b1edc9..59f166acdb5 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/EvaluationResult.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/EvaluationResult.h
@@ -58,73 +58,73 @@ namespace Model
 
 
     /**
-     * <p>The name of the API action tested on the indicated resource.</p>
+     * <p>The name of the API operation tested on the indicated resource.</p>
      */
     inline const Aws::String& GetEvalActionName() const{ return m_evalActionName; }
 
     /**
-     * <p>The name of the API action tested on the indicated resource.</p>
+     * <p>The name of the API operation tested on the indicated resource.</p>
      */
     inline void SetEvalActionName(const Aws::String& value) { m_evalActionNameHasBeenSet = true; m_evalActionName = value; }
 
     /**
-     * <p>The name of the API action tested on the indicated resource.</p>
+     * <p>The name of the API operation tested on the indicated resource.</p>
      */
     inline void SetEvalActionName(Aws::String&& value) { m_evalActionNameHasBeenSet = true; m_evalActionName = std::move(value); }
 
     /**
-     * <p>The name of the API action tested on the indicated resource.</p>
+     * <p>The name of the API operation tested on the indicated resource.</p>
      */
     inline void SetEvalActionName(const char* value) { m_evalActionNameHasBeenSet = true; m_evalActionName.assign(value); }
 
     /**
-     * <p>The name of the API action tested on the indicated resource.</p>
+     * <p>The name of the API operation tested on the indicated resource.</p>
      */
     inline EvaluationResult& WithEvalActionName(const Aws::String& value) { SetEvalActionName(value); return *this;}
 
     /**
-     * <p>The name of the API action tested on the indicated resource.</p>
+     * <p>The name of the API operation tested on the indicated resource.</p>
      */
     inline EvaluationResult& WithEvalActionName(Aws::String&& value) { SetEvalActionName(std::move(value)); return *this;}
 
     /**
-     * <p>The name of the API action tested on the indicated resource.</p>
+     * <p>The name of the API operation tested on the indicated resource.</p>
      */
     inline EvaluationResult& WithEvalActionName(const char* value) { SetEvalActionName(value); return *this;}
 
 
     /**
-     * <p>The ARN of the resource that the indicated API action was tested on.</p>
+     * <p>The ARN of the resource that the indicated API operation was tested on.</p>
      */
     inline const Aws::String& GetEvalResourceName() const{ return m_evalResourceName; }
 
     /**
-     * <p>The ARN of the resource that the indicated API action was tested on.</p>
+     * <p>The ARN of the resource that the indicated API operation was tested on.</p>
      */
     inline void SetEvalResourceName(const Aws::String& value) { m_evalResourceNameHasBeenSet = true; m_evalResourceName = value; }
 
     /**
-     * <p>The ARN of the resource that the indicated API action was tested on.</p>
+     * <p>The ARN of the resource that the indicated API operation was tested on.</p>
      */
     inline void SetEvalResourceName(Aws::String&& value) { m_evalResourceNameHasBeenSet = true; m_evalResourceName = std::move(value); }
 
     /**
-     * <p>The ARN of the resource that the indicated API action was tested on.</p>
+     * <p>The ARN of the resource that the indicated API operation was tested on.</p>
      */
     inline void SetEvalResourceName(const char* value) { m_evalResourceNameHasBeenSet = true; m_evalResourceName.assign(value); }
 
     /**
-     * <p>The ARN of the resource that the indicated API action was tested on.</p>
+     * <p>The ARN of the resource that the indicated API operation was tested on.</p>
      */
     inline EvaluationResult& WithEvalResourceName(const Aws::String& value) { SetEvalResourceName(value); return *this;}
 
     /**
-     * <p>The ARN of the resource that the indicated API action was tested on.</p>
+     * <p>The ARN of the resource that the indicated API operation was tested on.</p>
      */
     inline EvaluationResult& WithEvalResourceName(Aws::String&& value) { SetEvalResourceName(std::move(value)); return *this;}
 
     /**
-     * <p>The ARN of the resource that the indicated API action was tested on.</p>
+     * <p>The ARN of the resource that the indicated API operation was tested on.</p>
      */
     inline EvaluationResult& WithEvalResourceName(const char* value) { SetEvalResourceName(value); return *this;}
 
@@ -157,64 +157,64 @@ namespace Model
 
     /**
      * <p>A list of the statements in the input policies that determine the result for
-     * this scenario. Remember that even if multiple statements allow the action on the
-     * resource, if only one statement denies that action, then the explicit deny
-     * overrides any allow, and the deny statement is the only entry included in the
-     * result.</p>
+     * this scenario. Remember that even if multiple statements allow the operation on
+     * the resource, if only one statement denies that operation, then the explicit
+     * deny overrides any allow, and the deny statement is the only entry included in
+     * the result.</p>
      */
     inline const Aws::Vector<Statement>& GetMatchedStatements() const{ return m_matchedStatements; }
 
     /**
      * <p>A list of the statements in the input policies that determine the result for
-     * this scenario. Remember that even if multiple statements allow the action on the
-     * resource, if only one statement denies that action, then the explicit deny
-     * overrides any allow, and the deny statement is the only entry included in the
-     * result.</p>
+     * this scenario. Remember that even if multiple statements allow the operation on
+     * the resource, if only one statement denies that operation, then the explicit
+     * deny overrides any allow, and the deny statement is the only entry included in
+     * the result.</p>
      */
     inline void SetMatchedStatements(const Aws::Vector<Statement>& value) { m_matchedStatementsHasBeenSet = true; m_matchedStatements = value; }
 
     /**
      * <p>A list of the statements in the input policies that determine the result for
-     * this scenario. Remember that even if multiple statements allow the action on the
-     * resource, if only one statement denies that action, then the explicit deny
-     * overrides any allow, and the deny statement is the only entry included in the
-     * result.</p>
+     * this scenario. Remember that even if multiple statements allow the operation on
+     * the resource, if only one statement denies that operation, then the explicit
+     * deny overrides any allow, and the deny statement is the only entry included in
+     * the result.</p>
      */
     inline void SetMatchedStatements(Aws::Vector<Statement>&& value) { m_matchedStatementsHasBeenSet = true; m_matchedStatements = std::move(value); }
 
     /**
      * <p>A list of the statements in the input policies that determine the result for
-     * this scenario. Remember that even if multiple statements allow the action on the
-     * resource, if only one statement denies that action, then the explicit deny
-     * overrides any allow, and the deny statement is the only entry included in the
-     * result.</p>
+     * this scenario. Remember that even if multiple statements allow the operation on
+     * the resource, if only one statement denies that operation, then the explicit
+     * deny overrides any allow, and the deny statement is the only entry included in
+     * the result.</p>
      */
     inline EvaluationResult& WithMatchedStatements(const Aws::Vector<Statement>& value) { SetMatchedStatements(value); return *this;}
 
     /**
      * <p>A list of the statements in the input policies that determine the result for
-     * this scenario. Remember that even if multiple statements allow the action on the
-     * resource, if only one statement denies that action, then the explicit deny
-     * overrides any allow, and the deny statement is the only entry included in the
-     * result.</p>
+     * this scenario. Remember that even if multiple statements allow the operation on
+     * the resource, if only one statement denies that operation, then the explicit
+     * deny overrides any allow, and the deny statement is the only entry included in
+     * the result.</p>
      */
     inline EvaluationResult& WithMatchedStatements(Aws::Vector<Statement>&& value) { SetMatchedStatements(std::move(value)); return *this;}
 
     /**
      * <p>A list of the statements in the input policies that determine the result for
-     * this scenario. Remember that even if multiple statements allow the action on the
-     * resource, if only one statement denies that action, then the explicit deny
-     * overrides any allow, and the deny statement is the only entry included in the
-     * result.</p>
+     * this scenario. Remember that even if multiple statements allow the operation on
+     * the resource, if only one statement denies that operation, then the explicit
+     * deny overrides any allow, and the deny statement is the only entry included in
+     * the result.</p>
      */
     inline EvaluationResult& AddMatchedStatements(const Statement& value) { m_matchedStatementsHasBeenSet = true; m_matchedStatements.push_back(value); return *this; }
 
     /**
      * <p>A list of the statements in the input policies that determine the result for
-     * this scenario. Remember that even if multiple statements allow the action on the
-     * resource, if only one statement denies that action, then the explicit deny
-     * overrides any allow, and the deny statement is the only entry included in the
-     * result.</p>
+     * this scenario. Remember that even if multiple statements allow the operation on
+     * the resource, if only one statement denies that operation, then the explicit
+     * deny overrides any allow, and the deny statement is the only entry included in
+     * the result.</p>
      */
     inline EvaluationResult& AddMatchedStatements(Statement&& value) { m_matchedStatementsHasBeenSet = true; m_matchedStatements.push_back(std::move(value)); return *this; }
 
@@ -475,43 +475,43 @@ namespace Model
 
 
     /**
-     * <p>The individual results of the simulation of the API action specified in
+     * <p>The individual results of the simulation of the API operation specified in
      * EvalActionName on each resource.</p>
      */
     inline const Aws::Vector<ResourceSpecificResult>& GetResourceSpecificResults() const{ return m_resourceSpecificResults; }
 
     /**
-     * <p>The individual results of the simulation of the API action specified in
+     * <p>The individual results of the simulation of the API operation specified in
      * EvalActionName on each resource.</p>
      */
     inline void SetResourceSpecificResults(const Aws::Vector<ResourceSpecificResult>& value) { m_resourceSpecificResultsHasBeenSet = true; m_resourceSpecificResults = value; }
 
     /**
-     * <p>The individual results of the simulation of the API action specified in
+     * <p>The individual results of the simulation of the API operation specified in
      * EvalActionName on each resource.</p>
      */
     inline void SetResourceSpecificResults(Aws::Vector<ResourceSpecificResult>&& value) { m_resourceSpecificResultsHasBeenSet = true; m_resourceSpecificResults = std::move(value); }
 
     /**
-     * <p>The individual results of the simulation of the API action specified in
+     * <p>The individual results of the simulation of the API operation specified in
      * EvalActionName on each resource.</p>
      */
     inline EvaluationResult& WithResourceSpecificResults(const Aws::Vector<ResourceSpecificResult>& value) { SetResourceSpecificResults(value); return *this;}
 
     /**
-     * <p>The individual results of the simulation of the API action specified in
+     * <p>The individual results of the simulation of the API operation specified in
      * EvalActionName on each resource.</p>
      */
     inline EvaluationResult& WithResourceSpecificResults(Aws::Vector<ResourceSpecificResult>&& value) { SetResourceSpecificResults(std::move(value)); return *this;}
 
     /**
-     * <p>The individual results of the simulation of the API action specified in
+     * <p>The individual results of the simulation of the API operation specified in
      * EvalActionName on each resource.</p>
      */
     inline EvaluationResult& AddResourceSpecificResults(const ResourceSpecificResult& value) { m_resourceSpecificResultsHasBeenSet = true; m_resourceSpecificResults.push_back(value); return *this; }
 
     /**
-     * <p>The individual results of the simulation of the API action specified in
+     * <p>The individual results of the simulation of the API operation specified in
      * EvalActionName on each resource.</p>
      */
     inline EvaluationResult& AddResourceSpecificResults(ResourceSpecificResult&& value) { m_resourceSpecificResultsHasBeenSet = true; m_resourceSpecificResults.push_back(std::move(value)); return *this; }
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/GetContextKeysForCustomPolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/GetContextKeysForCustomPolicyRequest.h
index 9263f26d9d6..c97680e0a7e 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/GetContextKeysForCustomPolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/GetContextKeysForCustomPolicyRequest.h
@@ -52,11 +52,12 @@ namespace Model
      * those policies. Each document is specified as a string containing the complete,
      * valid JSON text of an IAM policy.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline const Aws::Vector<Aws::String>& GetPolicyInputList() const{ return m_policyInputList; }
 
@@ -65,11 +66,12 @@ namespace Model
      * those policies. Each document is specified as a string containing the complete,
      * valid JSON text of an IAM policy.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyInputList(const Aws::Vector<Aws::String>& value) { m_policyInputListHasBeenSet = true; m_policyInputList = value; }
 
@@ -78,11 +80,12 @@ namespace Model
      * those policies. Each document is specified as a string containing the complete,
      * valid JSON text of an IAM policy.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyInputList(Aws::Vector<Aws::String>&& value) { m_policyInputListHasBeenSet = true; m_policyInputList = std::move(value); }
 
@@ -91,11 +94,12 @@ namespace Model
      * those policies. Each document is specified as a string containing the complete,
      * valid JSON text of an IAM policy.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline GetContextKeysForCustomPolicyRequest& WithPolicyInputList(const Aws::Vector<Aws::String>& value) { SetPolicyInputList(value); return *this;}
 
@@ -104,11 +108,12 @@ namespace Model
      * those policies. Each document is specified as a string containing the complete,
      * valid JSON text of an IAM policy.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline GetContextKeysForCustomPolicyRequest& WithPolicyInputList(Aws::Vector<Aws::String>&& value) { SetPolicyInputList(std::move(value)); return *this;}
 
@@ -117,11 +122,12 @@ namespace Model
      * those policies. Each document is specified as a string containing the complete,
      * valid JSON text of an IAM policy.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline GetContextKeysForCustomPolicyRequest& AddPolicyInputList(const Aws::String& value) { m_policyInputListHasBeenSet = true; m_policyInputList.push_back(value); return *this; }
 
@@ -130,11 +136,12 @@ namespace Model
      * those policies. Each document is specified as a string containing the complete,
      * valid JSON text of an IAM policy.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline GetContextKeysForCustomPolicyRequest& AddPolicyInputList(Aws::String&& value) { m_policyInputListHasBeenSet = true; m_policyInputList.push_back(std::move(value)); return *this; }
 
@@ -143,11 +150,12 @@ namespace Model
      * those policies. Each document is specified as a string containing the complete,
      * valid JSON text of an IAM policy.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline GetContextKeysForCustomPolicyRequest& AddPolicyInputList(const char* value) { m_policyInputListHasBeenSet = true; m_policyInputList.push_back(value); return *this; }
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/GetContextKeysForPrincipalPolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/GetContextKeysForPrincipalPolicyRequest.h
index c7a598104d2..0af14375f10 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/GetContextKeysForPrincipalPolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/GetContextKeysForPrincipalPolicyRequest.h
@@ -50,12 +50,12 @@ namespace Model
     /**
      * <p>The ARN of a user, group, or role whose policies contain the context keys
      * that you want listed. If you specify a user, the list includes context keys that
-     * are found in all policies attached to the user as well as to all groups that the
-     * user is a member of. If you pick a group or a role, then it includes only those
-     * context keys that are found in policies attached to that entity. Note that all
-     * parameters are shown in unencoded form here for clarity, but must be URL encoded
-     * to be included as a part of a real HTML request.</p> <p>For more information
-     * about ARNs, see <a
+     * are found in all policies that are attached to the user. The list also includes
+     * all groups that the user is a member of. If you pick a group or a role, then it
+     * includes only those context keys that are found in policies attached to that
+     * entity. Note that all parameters are shown in unencoded form here for clarity,
+     * but must be URL encoded to be included as a part of a real HTML request.</p>
+     * <p>For more information about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
      * Reference</i>.</p>
@@ -65,12 +65,12 @@ namespace Model
     /**
      * <p>The ARN of a user, group, or role whose policies contain the context keys
      * that you want listed. If you specify a user, the list includes context keys that
-     * are found in all policies attached to the user as well as to all groups that the
-     * user is a member of. If you pick a group or a role, then it includes only those
-     * context keys that are found in policies attached to that entity. Note that all
-     * parameters are shown in unencoded form here for clarity, but must be URL encoded
-     * to be included as a part of a real HTML request.</p> <p>For more information
-     * about ARNs, see <a
+     * are found in all policies that are attached to the user. The list also includes
+     * all groups that the user is a member of. If you pick a group or a role, then it
+     * includes only those context keys that are found in policies attached to that
+     * entity. Note that all parameters are shown in unencoded form here for clarity,
+     * but must be URL encoded to be included as a part of a real HTML request.</p>
+     * <p>For more information about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
      * Reference</i>.</p>
@@ -80,12 +80,12 @@ namespace Model
     /**
      * <p>The ARN of a user, group, or role whose policies contain the context keys
      * that you want listed. If you specify a user, the list includes context keys that
-     * are found in all policies attached to the user as well as to all groups that the
-     * user is a member of. If you pick a group or a role, then it includes only those
-     * context keys that are found in policies attached to that entity. Note that all
-     * parameters are shown in unencoded form here for clarity, but must be URL encoded
-     * to be included as a part of a real HTML request.</p> <p>For more information
-     * about ARNs, see <a
+     * are found in all policies that are attached to the user. The list also includes
+     * all groups that the user is a member of. If you pick a group or a role, then it
+     * includes only those context keys that are found in policies attached to that
+     * entity. Note that all parameters are shown in unencoded form here for clarity,
+     * but must be URL encoded to be included as a part of a real HTML request.</p>
+     * <p>For more information about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
      * Reference</i>.</p>
@@ -95,12 +95,12 @@ namespace Model
     /**
      * <p>The ARN of a user, group, or role whose policies contain the context keys
      * that you want listed. If you specify a user, the list includes context keys that
-     * are found in all policies attached to the user as well as to all groups that the
-     * user is a member of. If you pick a group or a role, then it includes only those
-     * context keys that are found in policies attached to that entity. Note that all
-     * parameters are shown in unencoded form here for clarity, but must be URL encoded
-     * to be included as a part of a real HTML request.</p> <p>For more information
-     * about ARNs, see <a
+     * are found in all policies that are attached to the user. The list also includes
+     * all groups that the user is a member of. If you pick a group or a role, then it
+     * includes only those context keys that are found in policies attached to that
+     * entity. Note that all parameters are shown in unencoded form here for clarity,
+     * but must be URL encoded to be included as a part of a real HTML request.</p>
+     * <p>For more information about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
      * Reference</i>.</p>
@@ -110,12 +110,12 @@ namespace Model
     /**
      * <p>The ARN of a user, group, or role whose policies contain the context keys
      * that you want listed. If you specify a user, the list includes context keys that
-     * are found in all policies attached to the user as well as to all groups that the
-     * user is a member of. If you pick a group or a role, then it includes only those
-     * context keys that are found in policies attached to that entity. Note that all
-     * parameters are shown in unencoded form here for clarity, but must be URL encoded
-     * to be included as a part of a real HTML request.</p> <p>For more information
-     * about ARNs, see <a
+     * are found in all policies that are attached to the user. The list also includes
+     * all groups that the user is a member of. If you pick a group or a role, then it
+     * includes only those context keys that are found in policies attached to that
+     * entity. Note that all parameters are shown in unencoded form here for clarity,
+     * but must be URL encoded to be included as a part of a real HTML request.</p>
+     * <p>For more information about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
      * Reference</i>.</p>
@@ -125,12 +125,12 @@ namespace Model
     /**
      * <p>The ARN of a user, group, or role whose policies contain the context keys
      * that you want listed. If you specify a user, the list includes context keys that
-     * are found in all policies attached to the user as well as to all groups that the
-     * user is a member of. If you pick a group or a role, then it includes only those
-     * context keys that are found in policies attached to that entity. Note that all
-     * parameters are shown in unencoded form here for clarity, but must be URL encoded
-     * to be included as a part of a real HTML request.</p> <p>For more information
-     * about ARNs, see <a
+     * are found in all policies that are attached to the user. The list also includes
+     * all groups that the user is a member of. If you pick a group or a role, then it
+     * includes only those context keys that are found in policies attached to that
+     * entity. Note that all parameters are shown in unencoded form here for clarity,
+     * but must be URL encoded to be included as a part of a real HTML request.</p>
+     * <p>For more information about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
      * Reference</i>.</p>
@@ -140,12 +140,12 @@ namespace Model
     /**
      * <p>The ARN of a user, group, or role whose policies contain the context keys
      * that you want listed. If you specify a user, the list includes context keys that
-     * are found in all policies attached to the user as well as to all groups that the
-     * user is a member of. If you pick a group or a role, then it includes only those
-     * context keys that are found in policies attached to that entity. Note that all
-     * parameters are shown in unencoded form here for clarity, but must be URL encoded
-     * to be included as a part of a real HTML request.</p> <p>For more information
-     * about ARNs, see <a
+     * are found in all policies that are attached to the user. The list also includes
+     * all groups that the user is a member of. If you pick a group or a role, then it
+     * includes only those context keys that are found in policies attached to that
+     * entity. Note that all parameters are shown in unencoded form here for clarity,
+     * but must be URL encoded to be included as a part of a real HTML request.</p>
+     * <p>For more information about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
      * Reference</i>.</p>
@@ -157,11 +157,12 @@ namespace Model
      * <p>An optional list of additional policies for which you want the list of
      * context keys that are referenced.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline const Aws::Vector<Aws::String>& GetPolicyInputList() const{ return m_policyInputList; }
 
@@ -169,11 +170,12 @@ namespace Model
      * <p>An optional list of additional policies for which you want the list of
      * context keys that are referenced.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyInputList(const Aws::Vector<Aws::String>& value) { m_policyInputListHasBeenSet = true; m_policyInputList = value; }
 
@@ -181,11 +183,12 @@ namespace Model
      * <p>An optional list of additional policies for which you want the list of
      * context keys that are referenced.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyInputList(Aws::Vector<Aws::String>&& value) { m_policyInputListHasBeenSet = true; m_policyInputList = std::move(value); }
 
@@ -193,11 +196,12 @@ namespace Model
      * <p>An optional list of additional policies for which you want the list of
      * context keys that are referenced.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline GetContextKeysForPrincipalPolicyRequest& WithPolicyInputList(const Aws::Vector<Aws::String>& value) { SetPolicyInputList(value); return *this;}
 
@@ -205,11 +209,12 @@ namespace Model
      * <p>An optional list of additional policies for which you want the list of
      * context keys that are referenced.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline GetContextKeysForPrincipalPolicyRequest& WithPolicyInputList(Aws::Vector<Aws::String>&& value) { SetPolicyInputList(std::move(value)); return *this;}
 
@@ -217,11 +222,12 @@ namespace Model
      * <p>An optional list of additional policies for which you want the list of
      * context keys that are referenced.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline GetContextKeysForPrincipalPolicyRequest& AddPolicyInputList(const Aws::String& value) { m_policyInputListHasBeenSet = true; m_policyInputList.push_back(value); return *this; }
 
@@ -229,11 +235,12 @@ namespace Model
      * <p>An optional list of additional policies for which you want the list of
      * context keys that are referenced.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline GetContextKeysForPrincipalPolicyRequest& AddPolicyInputList(Aws::String&& value) { m_policyInputListHasBeenSet = true; m_policyInputList.push_back(std::move(value)); return *this; }
 
@@ -241,11 +248,12 @@ namespace Model
      * <p>An optional list of additional policies for which you want the list of
      * context keys that are referenced.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline GetContextKeysForPrincipalPolicyRequest& AddPolicyInputList(const char* value) { m_policyInputListHasBeenSet = true; m_policyInputList.push_back(value); return *this; }
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/GetGroupPolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/GetGroupPolicyRequest.h
index 27cad152e6f..98db9238a3c 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/GetGroupPolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/GetGroupPolicyRequest.h
@@ -50,7 +50,8 @@ namespace Model
      * <p>The name of the group the policy is associated with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline const Aws::String& GetGroupName() const{ return m_groupName; }
 
@@ -58,7 +59,8 @@ namespace Model
      * <p>The name of the group the policy is associated with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetGroupName(const Aws::String& value) { m_groupNameHasBeenSet = true; m_groupName = value; }
 
@@ -66,7 +68,8 @@ namespace Model
      * <p>The name of the group the policy is associated with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetGroupName(Aws::String&& value) { m_groupNameHasBeenSet = true; m_groupName = std::move(value); }
 
@@ -74,7 +77,8 @@ namespace Model
      * <p>The name of the group the policy is associated with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetGroupName(const char* value) { m_groupNameHasBeenSet = true; m_groupName.assign(value); }
 
@@ -82,7 +86,8 @@ namespace Model
      * <p>The name of the group the policy is associated with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline GetGroupPolicyRequest& WithGroupName(const Aws::String& value) { SetGroupName(value); return *this;}
 
@@ -90,7 +95,8 @@ namespace Model
      * <p>The name of the group the policy is associated with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline GetGroupPolicyRequest& WithGroupName(Aws::String&& value) { SetGroupName(std::move(value)); return *this;}
 
@@ -98,7 +104,8 @@ namespace Model
      * <p>The name of the group the policy is associated with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline GetGroupPolicyRequest& WithGroupName(const char* value) { SetGroupName(value); return *this;}
 
@@ -107,7 +114,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetPolicyName() const{ return m_policyName; }
 
@@ -115,7 +122,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(const Aws::String& value) { m_policyNameHasBeenSet = true; m_policyName = value; }
 
@@ -123,7 +130,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(Aws::String&& value) { m_policyNameHasBeenSet = true; m_policyName = std::move(value); }
 
@@ -131,7 +138,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(const char* value) { m_policyNameHasBeenSet = true; m_policyName.assign(value); }
 
@@ -139,7 +146,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline GetGroupPolicyRequest& WithPolicyName(const Aws::String& value) { SetPolicyName(value); return *this;}
 
@@ -147,7 +154,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline GetGroupPolicyRequest& WithPolicyName(Aws::String&& value) { SetPolicyName(std::move(value)); return *this;}
 
@@ -155,7 +162,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline GetGroupPolicyRequest& WithPolicyName(const char* value) { SetPolicyName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/GetGroupRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/GetGroupRequest.h
index 38738270354..6f7ecfef109 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/GetGroupRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/GetGroupRequest.h
@@ -50,7 +50,7 @@ namespace Model
      * <p>The name of the group.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetGroupName() const{ return m_groupName; }
 
@@ -58,7 +58,7 @@ namespace Model
      * <p>The name of the group.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const Aws::String& value) { m_groupNameHasBeenSet = true; m_groupName = value; }
 
@@ -66,7 +66,7 @@ namespace Model
      * <p>The name of the group.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(Aws::String&& value) { m_groupNameHasBeenSet = true; m_groupName = std::move(value); }
 
@@ -74,7 +74,7 @@ namespace Model
      * <p>The name of the group.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const char* value) { m_groupNameHasBeenSet = true; m_groupName.assign(value); }
 
@@ -82,7 +82,7 @@ namespace Model
      * <p>The name of the group.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline GetGroupRequest& WithGroupName(const Aws::String& value) { SetGroupName(value); return *this;}
 
@@ -90,7 +90,7 @@ namespace Model
      * <p>The name of the group.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline GetGroupRequest& WithGroupName(Aws::String&& value) { SetGroupName(std::move(value)); return *this;}
 
@@ -98,7 +98,7 @@ namespace Model
      * <p>The name of the group.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline GetGroupRequest& WithGroupName(const char* value) { SetGroupName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/GetInstanceProfileRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/GetInstanceProfileRequest.h
index 0d26915b3ad..f9544bfe31a 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/GetInstanceProfileRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/GetInstanceProfileRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetInstanceProfileName() const{ return m_instanceProfileName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetInstanceProfileName(const Aws::String& value) { m_instanceProfileNameHasBeenSet = true; m_instanceProfileName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetInstanceProfileName(Aws::String&& value) { m_instanceProfileNameHasBeenSet = true; m_instanceProfileName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetInstanceProfileName(const char* value) { m_instanceProfileNameHasBeenSet = true; m_instanceProfileName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline GetInstanceProfileRequest& WithInstanceProfileName(const Aws::String& value) { SetInstanceProfileName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline GetInstanceProfileRequest& WithInstanceProfileName(Aws::String&& value) { SetInstanceProfileName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline GetInstanceProfileRequest& WithInstanceProfileName(const char* value) { SetInstanceProfileName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/GetLoginProfileRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/GetLoginProfileRequest.h
index 99e25ca7df1..5fa4869c0e0 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/GetLoginProfileRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/GetLoginProfileRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline GetLoginProfileRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline GetLoginProfileRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline GetLoginProfileRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/GetOpenIDConnectProviderRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/GetOpenIDConnectProviderRequest.h
index 320071465d9..472029e505c 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/GetOpenIDConnectProviderRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/GetOpenIDConnectProviderRequest.h
@@ -49,8 +49,8 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the OIDC provider resource object in IAM to
      * get information for. You can get a list of OIDC provider resource ARNs by using
-     * the <a>ListOpenIDConnectProviders</a> action.</p> <p>For more information about
-     * ARNs, see <a
+     * the <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more information
+     * about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
      * Reference</i>.</p>
@@ -60,8 +60,8 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the OIDC provider resource object in IAM to
      * get information for. You can get a list of OIDC provider resource ARNs by using
-     * the <a>ListOpenIDConnectProviders</a> action.</p> <p>For more information about
-     * ARNs, see <a
+     * the <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more information
+     * about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
      * Reference</i>.</p>
@@ -71,8 +71,8 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the OIDC provider resource object in IAM to
      * get information for. You can get a list of OIDC provider resource ARNs by using
-     * the <a>ListOpenIDConnectProviders</a> action.</p> <p>For more information about
-     * ARNs, see <a
+     * the <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more information
+     * about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
      * Reference</i>.</p>
@@ -82,8 +82,8 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the OIDC provider resource object in IAM to
      * get information for. You can get a list of OIDC provider resource ARNs by using
-     * the <a>ListOpenIDConnectProviders</a> action.</p> <p>For more information about
-     * ARNs, see <a
+     * the <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more information
+     * about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
      * Reference</i>.</p>
@@ -93,8 +93,8 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the OIDC provider resource object in IAM to
      * get information for. You can get a list of OIDC provider resource ARNs by using
-     * the <a>ListOpenIDConnectProviders</a> action.</p> <p>For more information about
-     * ARNs, see <a
+     * the <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more information
+     * about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
      * Reference</i>.</p>
@@ -104,8 +104,8 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the OIDC provider resource object in IAM to
      * get information for. You can get a list of OIDC provider resource ARNs by using
-     * the <a>ListOpenIDConnectProviders</a> action.</p> <p>For more information about
-     * ARNs, see <a
+     * the <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more information
+     * about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
      * Reference</i>.</p>
@@ -115,8 +115,8 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the OIDC provider resource object in IAM to
      * get information for. You can get a list of OIDC provider resource ARNs by using
-     * the <a>ListOpenIDConnectProviders</a> action.</p> <p>For more information about
-     * ARNs, see <a
+     * the <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more information
+     * about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
      * Reference</i>.</p>
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/GetRolePolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/GetRolePolicyRequest.h
index 99ea1770353..4165374284d 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/GetRolePolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/GetRolePolicyRequest.h
@@ -107,7 +107,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetPolicyName() const{ return m_policyName; }
 
@@ -115,7 +115,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(const Aws::String& value) { m_policyNameHasBeenSet = true; m_policyName = value; }
 
@@ -123,7 +123,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(Aws::String&& value) { m_policyNameHasBeenSet = true; m_policyName = std::move(value); }
 
@@ -131,7 +131,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(const char* value) { m_policyNameHasBeenSet = true; m_policyName.assign(value); }
 
@@ -139,7 +139,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline GetRolePolicyRequest& WithPolicyName(const Aws::String& value) { SetPolicyName(value); return *this;}
 
@@ -147,7 +147,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline GetRolePolicyRequest& WithPolicyName(Aws::String&& value) { SetPolicyName(std::move(value)); return *this;}
 
@@ -155,7 +155,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline GetRolePolicyRequest& WithPolicyName(const char* value) { SetPolicyName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/GetSSHPublicKeyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/GetSSHPublicKeyRequest.h
index 64aa2fffaa8..13478ef83e5 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/GetSSHPublicKeyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/GetSSHPublicKeyRequest.h
@@ -52,7 +52,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -61,7 +61,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -70,7 +70,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -79,7 +79,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -88,7 +88,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline GetSSHPublicKeyRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -97,7 +97,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline GetSSHPublicKeyRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -106,7 +106,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline GetSSHPublicKeyRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/GetServerCertificateRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/GetServerCertificateRequest.h
index 3814995285c..b105690c8aa 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/GetServerCertificateRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/GetServerCertificateRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * about.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetServerCertificateName() const{ return m_serverCertificateName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * about.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetServerCertificateName(const Aws::String& value) { m_serverCertificateNameHasBeenSet = true; m_serverCertificateName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * about.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetServerCertificateName(Aws::String&& value) { m_serverCertificateNameHasBeenSet = true; m_serverCertificateName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * about.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetServerCertificateName(const char* value) { m_serverCertificateNameHasBeenSet = true; m_serverCertificateName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * about.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline GetServerCertificateRequest& WithServerCertificateName(const Aws::String& value) { SetServerCertificateName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * about.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline GetServerCertificateRequest& WithServerCertificateName(Aws::String&& value) { SetServerCertificateName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * about.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline GetServerCertificateRequest& WithServerCertificateName(const char* value) { SetServerCertificateName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/GetUserPolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/GetUserPolicyRequest.h
index d6008ae7bf6..1cbc76dcf0d 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/GetUserPolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/GetUserPolicyRequest.h
@@ -50,7 +50,8 @@ namespace Model
      * <p>The name of the user who the policy is associated with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -58,7 +59,8 @@ namespace Model
      * <p>The name of the user who the policy is associated with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -66,7 +68,8 @@ namespace Model
      * <p>The name of the user who the policy is associated with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -74,7 +77,8 @@ namespace Model
      * <p>The name of the user who the policy is associated with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -82,7 +86,8 @@ namespace Model
      * <p>The name of the user who the policy is associated with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline GetUserPolicyRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -90,7 +95,8 @@ namespace Model
      * <p>The name of the user who the policy is associated with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline GetUserPolicyRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -98,7 +104,8 @@ namespace Model
      * <p>The name of the user who the policy is associated with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline GetUserPolicyRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
@@ -107,7 +114,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetPolicyName() const{ return m_policyName; }
 
@@ -115,7 +122,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(const Aws::String& value) { m_policyNameHasBeenSet = true; m_policyName = value; }
 
@@ -123,7 +130,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(Aws::String&& value) { m_policyNameHasBeenSet = true; m_policyName = std::move(value); }
 
@@ -131,7 +138,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(const char* value) { m_policyNameHasBeenSet = true; m_policyName.assign(value); }
 
@@ -139,7 +146,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline GetUserPolicyRequest& WithPolicyName(const Aws::String& value) { SetPolicyName(value); return *this;}
 
@@ -147,7 +154,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline GetUserPolicyRequest& WithPolicyName(Aws::String&& value) { SetPolicyName(std::move(value)); return *this;}
 
@@ -155,7 +162,7 @@ namespace Model
      * <p>The name of the policy document to get.</p> <p>This parameter allows (per its
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-+</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline GetUserPolicyRequest& WithPolicyName(const char* value) { SetPolicyName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/GetUserRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/GetUserRequest.h
index faca99c79bd..4a8832fa724 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/GetUserRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/GetUserRequest.h
@@ -52,7 +52,7 @@ namespace Model
      * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -62,7 +62,7 @@ namespace Model
      * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -72,7 +72,7 @@ namespace Model
      * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -82,7 +82,7 @@ namespace Model
      * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -92,7 +92,7 @@ namespace Model
      * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline GetUserRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -102,7 +102,7 @@ namespace Model
      * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline GetUserRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -112,7 +112,7 @@ namespace Model
      * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline GetUserRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/Group.h b/aws-cpp-sdk-iam/include/aws/iam/model/Group.h
index 75eebf92e17..4852afbd1d5 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/Group.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/Group.h
@@ -36,7 +36,7 @@ namespace Model
 
   /**
    * <p>Contains information about an IAM group entity.</p> <p>This data type is used
-   * as a response element in the following actions:</p> <ul> <li> <p>
+   * as a response element in the following operations:</p> <ul> <li> <p>
    * <a>CreateGroup</a> </p> </li> <li> <p> <a>GetGroup</a> </p> </li> <li> <p>
    * <a>ListGroups</a> </p> </li> </ul><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/Group">AWS API
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/GroupDetail.h b/aws-cpp-sdk-iam/include/aws/iam/model/GroupDetail.h
index 0de63455a44..94457d03936 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/GroupDetail.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/GroupDetail.h
@@ -40,7 +40,7 @@ namespace Model
   /**
    * <p>Contains information about an IAM group, including all of the group's
    * policies.</p> <p>This data type is used as a response element in the
-   * <a>GetAccountAuthorizationDetails</a> action.</p><p><h3>See Also:</h3>   <a
+   * <a>GetAccountAuthorizationDetails</a> operation.</p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/GroupDetail">AWS API
    * Reference</a></p>
    */
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/InstanceProfile.h b/aws-cpp-sdk-iam/include/aws/iam/model/InstanceProfile.h
index d9842048e16..0c2f7561ab6 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/InstanceProfile.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/InstanceProfile.h
@@ -38,7 +38,7 @@ namespace Model
 
   /**
    * <p>Contains information about an instance profile.</p> <p>This data type is used
-   * as a response element in the following actions:</p> <ul> <li> <p>
+   * as a response element in the following operations:</p> <ul> <li> <p>
    * <a>CreateInstanceProfile</a> </p> </li> <li> <p> <a>GetInstanceProfile</a> </p>
    * </li> <li> <p> <a>ListInstanceProfiles</a> </p> </li> <li> <p>
    * <a>ListInstanceProfilesForRole</a> </p> </li> </ul><p><h3>See Also:</h3>   <a
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListAccessKeysRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListAccessKeysRequest.h
index dc7c375926b..534feac4126 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListAccessKeysRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListAccessKeysRequest.h
@@ -50,7 +50,7 @@ namespace Model
      * <p>The name of the user.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -58,7 +58,7 @@ namespace Model
      * <p>The name of the user.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -66,7 +66,7 @@ namespace Model
      * <p>The name of the user.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -74,7 +74,7 @@ namespace Model
      * <p>The name of the user.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -82,7 +82,7 @@ namespace Model
      * <p>The name of the user.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListAccessKeysRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -90,7 +90,7 @@ namespace Model
      * <p>The name of the user.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListAccessKeysRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -98,7 +98,7 @@ namespace Model
      * <p>The name of the user.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListAccessKeysRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListAttachedGroupPoliciesRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListAttachedGroupPoliciesRequest.h
index 6bc5f872647..0777947e456 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListAttachedGroupPoliciesRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListAttachedGroupPoliciesRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * for.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetGroupName() const{ return m_groupName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * for.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const Aws::String& value) { m_groupNameHasBeenSet = true; m_groupName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * for.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(Aws::String&& value) { m_groupNameHasBeenSet = true; m_groupName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * for.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const char* value) { m_groupNameHasBeenSet = true; m_groupName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * for.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListAttachedGroupPoliciesRequest& WithGroupName(const Aws::String& value) { SetGroupName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * for.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListAttachedGroupPoliciesRequest& WithGroupName(Aws::String&& value) { SetGroupName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * for.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListAttachedGroupPoliciesRequest& WithGroupName(const char* value) { SetGroupName(value); return *this;}
 
@@ -113,77 +113,84 @@ namespace Model
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline const Aws::String& GetPathPrefix() const{ return m_pathPrefix; }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(const Aws::String& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = value; }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(Aws::String&& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = std::move(value); }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(const char* value) { m_pathPrefixHasBeenSet = true; m_pathPrefix.assign(value); }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListAttachedGroupPoliciesRequest& WithPathPrefix(const Aws::String& value) { SetPathPrefix(value); return *this;}
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListAttachedGroupPoliciesRequest& WithPathPrefix(Aws::String&& value) { SetPathPrefix(std::move(value)); return *this;}
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListAttachedGroupPoliciesRequest& WithPathPrefix(const char* value) { SetPathPrefix(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListAttachedRolePoliciesRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListAttachedRolePoliciesRequest.h
index c5fbf229553..e6315465339 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListAttachedRolePoliciesRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListAttachedRolePoliciesRequest.h
@@ -113,77 +113,84 @@ namespace Model
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline const Aws::String& GetPathPrefix() const{ return m_pathPrefix; }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(const Aws::String& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = value; }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(Aws::String&& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = std::move(value); }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(const char* value) { m_pathPrefixHasBeenSet = true; m_pathPrefix.assign(value); }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListAttachedRolePoliciesRequest& WithPathPrefix(const Aws::String& value) { SetPathPrefix(value); return *this;}
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListAttachedRolePoliciesRequest& WithPathPrefix(Aws::String&& value) { SetPathPrefix(std::move(value)); return *this;}
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListAttachedRolePoliciesRequest& WithPathPrefix(const char* value) { SetPathPrefix(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListAttachedUserPoliciesRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListAttachedUserPoliciesRequest.h
index db9bdb8d6ce..f6ae9bbf904 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListAttachedUserPoliciesRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListAttachedUserPoliciesRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * for.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * for.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * for.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * for.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * for.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListAttachedUserPoliciesRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * for.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListAttachedUserPoliciesRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * for.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListAttachedUserPoliciesRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
@@ -113,77 +113,84 @@ namespace Model
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline const Aws::String& GetPathPrefix() const{ return m_pathPrefix; }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(const Aws::String& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = value; }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(Aws::String&& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = std::move(value); }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(const char* value) { m_pathPrefixHasBeenSet = true; m_pathPrefix.assign(value); }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListAttachedUserPoliciesRequest& WithPathPrefix(const Aws::String& value) { SetPathPrefix(value); return *this;}
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListAttachedUserPoliciesRequest& WithPathPrefix(Aws::String&& value) { SetPathPrefix(std::move(value)); return *this;}
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListAttachedUserPoliciesRequest& WithPathPrefix(const char* value) { SetPathPrefix(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListEntitiesForPolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListEntitiesForPolicyRequest.h
index 5ca8e347672..3456ad6b701 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListEntitiesForPolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListEntitiesForPolicyRequest.h
@@ -160,77 +160,84 @@ namespace Model
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all entities.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline const Aws::String& GetPathPrefix() const{ return m_pathPrefix; }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all entities.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(const Aws::String& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = value; }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all entities.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(Aws::String&& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = std::move(value); }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all entities.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(const char* value) { m_pathPrefixHasBeenSet = true; m_pathPrefix.assign(value); }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all entities.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListEntitiesForPolicyRequest& WithPathPrefix(const Aws::String& value) { SetPathPrefix(value); return *this;}
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all entities.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListEntitiesForPolicyRequest& WithPathPrefix(Aws::String&& value) { SetPathPrefix(std::move(value)); return *this;}
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all entities.</p> <p>This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListEntitiesForPolicyRequest& WithPathPrefix(const char* value) { SetPathPrefix(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListGroupPoliciesRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListGroupPoliciesRequest.h
index b31fdd0737d..bf0a4f14b6e 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListGroupPoliciesRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListGroupPoliciesRequest.h
@@ -50,7 +50,7 @@ namespace Model
      * <p>The name of the group to list policies for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetGroupName() const{ return m_groupName; }
 
@@ -58,7 +58,7 @@ namespace Model
      * <p>The name of the group to list policies for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const Aws::String& value) { m_groupNameHasBeenSet = true; m_groupName = value; }
 
@@ -66,7 +66,7 @@ namespace Model
      * <p>The name of the group to list policies for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(Aws::String&& value) { m_groupNameHasBeenSet = true; m_groupName = std::move(value); }
 
@@ -74,7 +74,7 @@ namespace Model
      * <p>The name of the group to list policies for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const char* value) { m_groupNameHasBeenSet = true; m_groupName.assign(value); }
 
@@ -82,7 +82,7 @@ namespace Model
      * <p>The name of the group to list policies for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline ListGroupPoliciesRequest& WithGroupName(const Aws::String& value) { SetGroupName(value); return *this;}
 
@@ -90,7 +90,7 @@ namespace Model
      * <p>The name of the group to list policies for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline ListGroupPoliciesRequest& WithGroupName(Aws::String&& value) { SetGroupName(std::move(value)); return *this;}
 
@@ -98,7 +98,7 @@ namespace Model
      * <p>The name of the group to list policies for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline ListGroupPoliciesRequest& WithGroupName(const char* value) { SetGroupName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListGroupPoliciesResult.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListGroupPoliciesResult.h
index e7ee4167373..ec8aa90392f 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListGroupPoliciesResult.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListGroupPoliciesResult.h
@@ -54,7 +54,7 @@ namespace Model
      * <p>A list of policy names.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::Vector<Aws::String>& GetPolicyNames() const{ return m_policyNames; }
 
@@ -62,7 +62,7 @@ namespace Model
      * <p>A list of policy names.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyNames(const Aws::Vector<Aws::String>& value) { m_policyNames = value; }
 
@@ -70,7 +70,7 @@ namespace Model
      * <p>A list of policy names.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyNames(Aws::Vector<Aws::String>&& value) { m_policyNames = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * <p>A list of policy names.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListGroupPoliciesResult& WithPolicyNames(const Aws::Vector<Aws::String>& value) { SetPolicyNames(value); return *this;}
 
@@ -86,7 +86,7 @@ namespace Model
      * <p>A list of policy names.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListGroupPoliciesResult& WithPolicyNames(Aws::Vector<Aws::String>&& value) { SetPolicyNames(std::move(value)); return *this;}
 
@@ -94,7 +94,7 @@ namespace Model
      * <p>A list of policy names.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListGroupPoliciesResult& AddPolicyNames(const Aws::String& value) { m_policyNames.push_back(value); return *this; }
 
@@ -102,7 +102,7 @@ namespace Model
      * <p>A list of policy names.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListGroupPoliciesResult& AddPolicyNames(Aws::String&& value) { m_policyNames.push_back(std::move(value)); return *this; }
 
@@ -110,7 +110,7 @@ namespace Model
      * <p>A list of policy names.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListGroupPoliciesResult& AddPolicyNames(const char* value) { m_policyNames.push_back(value); return *this; }
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListGroupsForUserRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListGroupsForUserRequest.h
index e5f3a606057..6da64be1cd6 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListGroupsForUserRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListGroupsForUserRequest.h
@@ -50,7 +50,7 @@ namespace Model
      * <p>The name of the user to list groups for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -58,7 +58,7 @@ namespace Model
      * <p>The name of the user to list groups for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -66,7 +66,7 @@ namespace Model
      * <p>The name of the user to list groups for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -74,7 +74,7 @@ namespace Model
      * <p>The name of the user to list groups for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -82,7 +82,7 @@ namespace Model
      * <p>The name of the user to list groups for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline ListGroupsForUserRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -90,7 +90,7 @@ namespace Model
      * <p>The name of the user to list groups for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline ListGroupsForUserRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -98,7 +98,7 @@ namespace Model
      * <p>The name of the user to list groups for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline ListGroupsForUserRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListGroupsRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListGroupsRequest.h
index 77888492bee..c668bf9d4ef 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListGroupsRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListGroupsRequest.h
@@ -51,11 +51,12 @@ namespace Model
      * <code>/division_abc/subdivision_xyz/</code> gets all groups whose path starts
      * with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all groups.
-     * This paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline const Aws::String& GetPathPrefix() const{ return m_pathPrefix; }
 
@@ -64,11 +65,12 @@ namespace Model
      * <code>/division_abc/subdivision_xyz/</code> gets all groups whose path starts
      * with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all groups.
-     * This paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(const Aws::String& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = value; }
 
@@ -77,11 +79,12 @@ namespace Model
      * <code>/division_abc/subdivision_xyz/</code> gets all groups whose path starts
      * with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all groups.
-     * This paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(Aws::String&& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = std::move(value); }
 
@@ -90,11 +93,12 @@ namespace Model
      * <code>/division_abc/subdivision_xyz/</code> gets all groups whose path starts
      * with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all groups.
-     * This paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(const char* value) { m_pathPrefixHasBeenSet = true; m_pathPrefix.assign(value); }
 
@@ -103,11 +107,12 @@ namespace Model
      * <code>/division_abc/subdivision_xyz/</code> gets all groups whose path starts
      * with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all groups.
-     * This paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListGroupsRequest& WithPathPrefix(const Aws::String& value) { SetPathPrefix(value); return *this;}
 
@@ -116,11 +121,12 @@ namespace Model
      * <code>/division_abc/subdivision_xyz/</code> gets all groups whose path starts
      * with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all groups.
-     * This paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListGroupsRequest& WithPathPrefix(Aws::String&& value) { SetPathPrefix(std::move(value)); return *this;}
 
@@ -129,11 +135,12 @@ namespace Model
      * <code>/division_abc/subdivision_xyz/</code> gets all groups whose path starts
      * with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all groups.
-     * This paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListGroupsRequest& WithPathPrefix(const char* value) { SetPathPrefix(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListInstanceProfilesRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListInstanceProfilesRequest.h
index 2b921ed79dd..0a8bd43ce90 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListInstanceProfilesRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListInstanceProfilesRequest.h
@@ -51,12 +51,12 @@ namespace Model
      * <code>/application_abc/component_xyz/</code> gets all instance profiles whose
      * path starts with <code>/application_abc/component_xyz/</code>.</p> <p>This
      * parameter is optional. If it is not included, it defaults to a slash (/),
-     * listing all instance profiles. This paramater allows (per its <a
+     * listing all instance profiles. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline const Aws::String& GetPathPrefix() const{ return m_pathPrefix; }
 
@@ -65,12 +65,12 @@ namespace Model
      * <code>/application_abc/component_xyz/</code> gets all instance profiles whose
      * path starts with <code>/application_abc/component_xyz/</code>.</p> <p>This
      * parameter is optional. If it is not included, it defaults to a slash (/),
-     * listing all instance profiles. This paramater allows (per its <a
+     * listing all instance profiles. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline void SetPathPrefix(const Aws::String& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = value; }
 
@@ -79,12 +79,12 @@ namespace Model
      * <code>/application_abc/component_xyz/</code> gets all instance profiles whose
      * path starts with <code>/application_abc/component_xyz/</code>.</p> <p>This
      * parameter is optional. If it is not included, it defaults to a slash (/),
-     * listing all instance profiles. This paramater allows (per its <a
+     * listing all instance profiles. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline void SetPathPrefix(Aws::String&& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = std::move(value); }
 
@@ -93,12 +93,12 @@ namespace Model
      * <code>/application_abc/component_xyz/</code> gets all instance profiles whose
      * path starts with <code>/application_abc/component_xyz/</code>.</p> <p>This
      * parameter is optional. If it is not included, it defaults to a slash (/),
-     * listing all instance profiles. This paramater allows (per its <a
+     * listing all instance profiles. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline void SetPathPrefix(const char* value) { m_pathPrefixHasBeenSet = true; m_pathPrefix.assign(value); }
 
@@ -107,12 +107,12 @@ namespace Model
      * <code>/application_abc/component_xyz/</code> gets all instance profiles whose
      * path starts with <code>/application_abc/component_xyz/</code>.</p> <p>This
      * parameter is optional. If it is not included, it defaults to a slash (/),
-     * listing all instance profiles. This paramater allows (per its <a
+     * listing all instance profiles. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline ListInstanceProfilesRequest& WithPathPrefix(const Aws::String& value) { SetPathPrefix(value); return *this;}
 
@@ -121,12 +121,12 @@ namespace Model
      * <code>/application_abc/component_xyz/</code> gets all instance profiles whose
      * path starts with <code>/application_abc/component_xyz/</code>.</p> <p>This
      * parameter is optional. If it is not included, it defaults to a slash (/),
-     * listing all instance profiles. This paramater allows (per its <a
+     * listing all instance profiles. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline ListInstanceProfilesRequest& WithPathPrefix(Aws::String&& value) { SetPathPrefix(std::move(value)); return *this;}
 
@@ -135,12 +135,12 @@ namespace Model
      * <code>/application_abc/component_xyz/</code> gets all instance profiles whose
      * path starts with <code>/application_abc/component_xyz/</code>.</p> <p>This
      * parameter is optional. If it is not included, it defaults to a slash (/),
-     * listing all instance profiles. This paramater allows (per its <a
+     * listing all instance profiles. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline ListInstanceProfilesRequest& WithPathPrefix(const char* value) { SetPathPrefix(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListMFADevicesRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListMFADevicesRequest.h
index 2c5ad9098c3..19e351152bd 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListMFADevicesRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListMFADevicesRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline ListMFADevicesRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline ListMFADevicesRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline ListMFADevicesRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListPoliciesRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListPoliciesRequest.h
index 6f55f9c4254..11ff9ea5828 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListPoliciesRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListPoliciesRequest.h
@@ -124,77 +124,84 @@ namespace Model
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies. This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline const Aws::String& GetPathPrefix() const{ return m_pathPrefix; }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies. This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(const Aws::String& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = value; }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies. This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(Aws::String&& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = std::move(value); }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies. This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(const char* value) { m_pathPrefixHasBeenSet = true; m_pathPrefix.assign(value); }
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies. This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListPoliciesRequest& WithPathPrefix(const Aws::String& value) { SetPathPrefix(value); return *this;}
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies. This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListPoliciesRequest& WithPathPrefix(Aws::String&& value) { SetPathPrefix(std::move(value)); return *this;}
 
     /**
      * <p>The path prefix for filtering the results. This parameter is optional. If it
      * is not included, it defaults to a slash (/), listing all policies. This
-     * paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListPoliciesRequest& WithPathPrefix(const char* value) { SetPathPrefix(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListRolesRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListRolesRequest.h
index 21b2999b681..40746a76a55 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListRolesRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListRolesRequest.h
@@ -51,11 +51,12 @@ namespace Model
      * <code>/application_abc/component_xyz/</code> gets all roles whose path starts
      * with <code>/application_abc/component_xyz/</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all roles.
-     * This paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline const Aws::String& GetPathPrefix() const{ return m_pathPrefix; }
 
@@ -64,11 +65,12 @@ namespace Model
      * <code>/application_abc/component_xyz/</code> gets all roles whose path starts
      * with <code>/application_abc/component_xyz/</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all roles.
-     * This paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(const Aws::String& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = value; }
 
@@ -77,11 +79,12 @@ namespace Model
      * <code>/application_abc/component_xyz/</code> gets all roles whose path starts
      * with <code>/application_abc/component_xyz/</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all roles.
-     * This paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(Aws::String&& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = std::move(value); }
 
@@ -90,11 +93,12 @@ namespace Model
      * <code>/application_abc/component_xyz/</code> gets all roles whose path starts
      * with <code>/application_abc/component_xyz/</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all roles.
-     * This paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline void SetPathPrefix(const char* value) { m_pathPrefixHasBeenSet = true; m_pathPrefix.assign(value); }
 
@@ -103,11 +107,12 @@ namespace Model
      * <code>/application_abc/component_xyz/</code> gets all roles whose path starts
      * with <code>/application_abc/component_xyz/</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all roles.
-     * This paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListRolesRequest& WithPathPrefix(const Aws::String& value) { SetPathPrefix(value); return *this;}
 
@@ -116,11 +121,12 @@ namespace Model
      * <code>/application_abc/component_xyz/</code> gets all roles whose path starts
      * with <code>/application_abc/component_xyz/</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all roles.
-     * This paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListRolesRequest& WithPathPrefix(Aws::String&& value) { SetPathPrefix(std::move(value)); return *this;}
 
@@ -129,11 +135,12 @@ namespace Model
      * <code>/application_abc/component_xyz/</code> gets all roles whose path starts
      * with <code>/application_abc/component_xyz/</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all roles.
-     * This paramater allows (per its <a href="http://wikipedia.org/wiki/regex">regex
+     * This parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of either a forward slash (/) by
-     * itself or a string that must begin and end with forward slashes, containing any
-     * ASCII character from the ! (\u0021) thru the DEL character (\u007F), including
-     * most punctuation characters, digits, and upper and lowercased letters.</p>
+     * itself or a string that must begin and end with forward slashes. In addition, it
+     * can contain any ASCII character from the ! (\u0021) through the DEL character
+     * (\u007F), including most punctuation characters, digits, and upper and
+     * lowercased letters.</p>
      */
     inline ListRolesRequest& WithPathPrefix(const char* value) { SetPathPrefix(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListSSHPublicKeysRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListSSHPublicKeysRequest.h
index 57720826cab..def8ddb653d 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListSSHPublicKeysRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListSSHPublicKeysRequest.h
@@ -48,71 +48,71 @@ namespace Model
 
     /**
      * <p>The name of the IAM user to list SSH public keys for. If none is specified,
-     * the UserName field is determined implicitly based on the AWS access key used to
-     * sign the request.</p> <p>This parameter allows (per its <a
+     * the <code>UserName</code> field is determined implicitly based on the AWS access
+     * key used to sign the request.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
     /**
      * <p>The name of the IAM user to list SSH public keys for. If none is specified,
-     * the UserName field is determined implicitly based on the AWS access key used to
-     * sign the request.</p> <p>This parameter allows (per its <a
+     * the <code>UserName</code> field is determined implicitly based on the AWS access
+     * key used to sign the request.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
     /**
      * <p>The name of the IAM user to list SSH public keys for. If none is specified,
-     * the UserName field is determined implicitly based on the AWS access key used to
-     * sign the request.</p> <p>This parameter allows (per its <a
+     * the <code>UserName</code> field is determined implicitly based on the AWS access
+     * key used to sign the request.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
     /**
      * <p>The name of the IAM user to list SSH public keys for. If none is specified,
-     * the UserName field is determined implicitly based on the AWS access key used to
-     * sign the request.</p> <p>This parameter allows (per its <a
+     * the <code>UserName</code> field is determined implicitly based on the AWS access
+     * key used to sign the request.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
     /**
      * <p>The name of the IAM user to list SSH public keys for. If none is specified,
-     * the UserName field is determined implicitly based on the AWS access key used to
-     * sign the request.</p> <p>This parameter allows (per its <a
+     * the <code>UserName</code> field is determined implicitly based on the AWS access
+     * key used to sign the request.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListSSHPublicKeysRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
     /**
      * <p>The name of the IAM user to list SSH public keys for. If none is specified,
-     * the UserName field is determined implicitly based on the AWS access key used to
-     * sign the request.</p> <p>This parameter allows (per its <a
+     * the <code>UserName</code> field is determined implicitly based on the AWS access
+     * key used to sign the request.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListSSHPublicKeysRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
     /**
      * <p>The name of the IAM user to list SSH public keys for. If none is specified,
-     * the UserName field is determined implicitly based on the AWS access key used to
-     * sign the request.</p> <p>This parameter allows (per its <a
+     * the <code>UserName</code> field is determined implicitly based on the AWS access
+     * key used to sign the request.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListSSHPublicKeysRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListServerCertificatesRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListServerCertificatesRequest.h
index 309ddb0aa17..fd0c653f534 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListServerCertificatesRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListServerCertificatesRequest.h
@@ -51,12 +51,12 @@ namespace Model
      * <code>/company/servercerts</code> would get all server certificates for which
      * the path starts with <code>/company/servercerts</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all server
-     * certificates. This paramater allows (per its <a
+     * certificates. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline const Aws::String& GetPathPrefix() const{ return m_pathPrefix; }
 
@@ -65,12 +65,12 @@ namespace Model
      * <code>/company/servercerts</code> would get all server certificates for which
      * the path starts with <code>/company/servercerts</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all server
-     * certificates. This paramater allows (per its <a
+     * certificates. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline void SetPathPrefix(const Aws::String& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = value; }
 
@@ -79,12 +79,12 @@ namespace Model
      * <code>/company/servercerts</code> would get all server certificates for which
      * the path starts with <code>/company/servercerts</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all server
-     * certificates. This paramater allows (per its <a
+     * certificates. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline void SetPathPrefix(Aws::String&& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = std::move(value); }
 
@@ -93,12 +93,12 @@ namespace Model
      * <code>/company/servercerts</code> would get all server certificates for which
      * the path starts with <code>/company/servercerts</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all server
-     * certificates. This paramater allows (per its <a
+     * certificates. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline void SetPathPrefix(const char* value) { m_pathPrefixHasBeenSet = true; m_pathPrefix.assign(value); }
 
@@ -107,12 +107,12 @@ namespace Model
      * <code>/company/servercerts</code> would get all server certificates for which
      * the path starts with <code>/company/servercerts</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all server
-     * certificates. This paramater allows (per its <a
+     * certificates. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline ListServerCertificatesRequest& WithPathPrefix(const Aws::String& value) { SetPathPrefix(value); return *this;}
 
@@ -121,12 +121,12 @@ namespace Model
      * <code>/company/servercerts</code> would get all server certificates for which
      * the path starts with <code>/company/servercerts</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all server
-     * certificates. This paramater allows (per its <a
+     * certificates. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline ListServerCertificatesRequest& WithPathPrefix(Aws::String&& value) { SetPathPrefix(std::move(value)); return *this;}
 
@@ -135,12 +135,12 @@ namespace Model
      * <code>/company/servercerts</code> would get all server certificates for which
      * the path starts with <code>/company/servercerts</code>.</p> <p>This parameter is
      * optional. If it is not included, it defaults to a slash (/), listing all server
-     * certificates. This paramater allows (per its <a
+     * certificates. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline ListServerCertificatesRequest& WithPathPrefix(const char* value) { SetPathPrefix(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListServiceSpecificCredentialsRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListServiceSpecificCredentialsRequest.h
index e04cb35352e..6b41958db94 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListServiceSpecificCredentialsRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListServiceSpecificCredentialsRequest.h
@@ -48,71 +48,71 @@ namespace Model
 
     /**
      * <p>The name of the user whose service-specific credentials you want information
-     * about. If this value is not specified then the operation assumes the user whose
+     * about. If this value is not specified, then the operation assumes the user whose
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
     /**
      * <p>The name of the user whose service-specific credentials you want information
-     * about. If this value is not specified then the operation assumes the user whose
+     * about. If this value is not specified, then the operation assumes the user whose
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
     /**
      * <p>The name of the user whose service-specific credentials you want information
-     * about. If this value is not specified then the operation assumes the user whose
+     * about. If this value is not specified, then the operation assumes the user whose
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
     /**
      * <p>The name of the user whose service-specific credentials you want information
-     * about. If this value is not specified then the operation assumes the user whose
+     * about. If this value is not specified, then the operation assumes the user whose
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
     /**
      * <p>The name of the user whose service-specific credentials you want information
-     * about. If this value is not specified then the operation assumes the user whose
+     * about. If this value is not specified, then the operation assumes the user whose
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline ListServiceSpecificCredentialsRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
     /**
      * <p>The name of the user whose service-specific credentials you want information
-     * about. If this value is not specified then the operation assumes the user whose
+     * about. If this value is not specified, then the operation assumes the user whose
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline ListServiceSpecificCredentialsRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
     /**
      * <p>The name of the user whose service-specific credentials you want information
-     * about. If this value is not specified then the operation assumes the user whose
+     * about. If this value is not specified, then the operation assumes the user whose
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline ListServiceSpecificCredentialsRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListSigningCertificatesRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListSigningCertificatesRequest.h
index d12b19df2a4..2196f1e4f94 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListSigningCertificatesRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListSigningCertificatesRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListSigningCertificatesRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListSigningCertificatesRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline ListSigningCertificatesRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListUserPoliciesRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListUserPoliciesRequest.h
index 86a22d92ed8..07920a27793 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListUserPoliciesRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListUserPoliciesRequest.h
@@ -50,7 +50,7 @@ namespace Model
      * <p>The name of the user to list policies for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -58,7 +58,7 @@ namespace Model
      * <p>The name of the user to list policies for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -66,7 +66,7 @@ namespace Model
      * <p>The name of the user to list policies for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -74,7 +74,7 @@ namespace Model
      * <p>The name of the user to list policies for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -82,7 +82,7 @@ namespace Model
      * <p>The name of the user to list policies for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline ListUserPoliciesRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -90,7 +90,7 @@ namespace Model
      * <p>The name of the user to list policies for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline ListUserPoliciesRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -98,7 +98,7 @@ namespace Model
      * <p>The name of the user to list policies for.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline ListUserPoliciesRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListUsersRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListUsersRequest.h
index 6b1bd807bdd..688fbc5d044 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListUsersRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListUsersRequest.h
@@ -51,12 +51,12 @@ namespace Model
      * <code>/division_abc/subdivision_xyz/</code>, which would get all user names
      * whose path starts with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This
      * parameter is optional. If it is not included, it defaults to a slash (/),
-     * listing all user names. This paramater allows (per its <a
+     * listing all user names. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline const Aws::String& GetPathPrefix() const{ return m_pathPrefix; }
 
@@ -65,12 +65,12 @@ namespace Model
      * <code>/division_abc/subdivision_xyz/</code>, which would get all user names
      * whose path starts with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This
      * parameter is optional. If it is not included, it defaults to a slash (/),
-     * listing all user names. This paramater allows (per its <a
+     * listing all user names. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline void SetPathPrefix(const Aws::String& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = value; }
 
@@ -79,12 +79,12 @@ namespace Model
      * <code>/division_abc/subdivision_xyz/</code>, which would get all user names
      * whose path starts with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This
      * parameter is optional. If it is not included, it defaults to a slash (/),
-     * listing all user names. This paramater allows (per its <a
+     * listing all user names. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline void SetPathPrefix(Aws::String&& value) { m_pathPrefixHasBeenSet = true; m_pathPrefix = std::move(value); }
 
@@ -93,12 +93,12 @@ namespace Model
      * <code>/division_abc/subdivision_xyz/</code>, which would get all user names
      * whose path starts with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This
      * parameter is optional. If it is not included, it defaults to a slash (/),
-     * listing all user names. This paramater allows (per its <a
+     * listing all user names. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline void SetPathPrefix(const char* value) { m_pathPrefixHasBeenSet = true; m_pathPrefix.assign(value); }
 
@@ -107,12 +107,12 @@ namespace Model
      * <code>/division_abc/subdivision_xyz/</code>, which would get all user names
      * whose path starts with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This
      * parameter is optional. If it is not included, it defaults to a slash (/),
-     * listing all user names. This paramater allows (per its <a
+     * listing all user names. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline ListUsersRequest& WithPathPrefix(const Aws::String& value) { SetPathPrefix(value); return *this;}
 
@@ -121,12 +121,12 @@ namespace Model
      * <code>/division_abc/subdivision_xyz/</code>, which would get all user names
      * whose path starts with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This
      * parameter is optional. If it is not included, it defaults to a slash (/),
-     * listing all user names. This paramater allows (per its <a
+     * listing all user names. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline ListUsersRequest& WithPathPrefix(Aws::String&& value) { SetPathPrefix(std::move(value)); return *this;}
 
@@ -135,12 +135,12 @@ namespace Model
      * <code>/division_abc/subdivision_xyz/</code>, which would get all user names
      * whose path starts with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This
      * parameter is optional. If it is not included, it defaults to a slash (/),
-     * listing all user names. This paramater allows (per its <a
+     * listing all user names. This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline ListUsersRequest& WithPathPrefix(const char* value) { SetPathPrefix(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ListVirtualMFADevicesRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ListVirtualMFADevicesRequest.h
index c40f96d8716..1163998b193 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ListVirtualMFADevicesRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ListVirtualMFADevicesRequest.h
@@ -49,7 +49,7 @@ namespace Model
 
     /**
      * <p> The status (<code>Unassigned</code> or <code>Assigned</code>) of the devices
-     * to list. If you do not specify an <code>AssignmentStatus</code>, the action
+     * to list. If you do not specify an <code>AssignmentStatus</code>, the operation
      * defaults to <code>Any</code> which lists both assigned and unassigned virtual
      * MFA devices.</p>
      */
@@ -57,7 +57,7 @@ namespace Model
 
     /**
      * <p> The status (<code>Unassigned</code> or <code>Assigned</code>) of the devices
-     * to list. If you do not specify an <code>AssignmentStatus</code>, the action
+     * to list. If you do not specify an <code>AssignmentStatus</code>, the operation
      * defaults to <code>Any</code> which lists both assigned and unassigned virtual
      * MFA devices.</p>
      */
@@ -65,7 +65,7 @@ namespace Model
 
     /**
      * <p> The status (<code>Unassigned</code> or <code>Assigned</code>) of the devices
-     * to list. If you do not specify an <code>AssignmentStatus</code>, the action
+     * to list. If you do not specify an <code>AssignmentStatus</code>, the operation
      * defaults to <code>Any</code> which lists both assigned and unassigned virtual
      * MFA devices.</p>
      */
@@ -73,7 +73,7 @@ namespace Model
 
     /**
      * <p> The status (<code>Unassigned</code> or <code>Assigned</code>) of the devices
-     * to list. If you do not specify an <code>AssignmentStatus</code>, the action
+     * to list. If you do not specify an <code>AssignmentStatus</code>, the operation
      * defaults to <code>Any</code> which lists both assigned and unassigned virtual
      * MFA devices.</p>
      */
@@ -81,7 +81,7 @@ namespace Model
 
     /**
      * <p> The status (<code>Unassigned</code> or <code>Assigned</code>) of the devices
-     * to list. If you do not specify an <code>AssignmentStatus</code>, the action
+     * to list. If you do not specify an <code>AssignmentStatus</code>, the operation
      * defaults to <code>Any</code> which lists both assigned and unassigned virtual
      * MFA devices.</p>
      */
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/LoginProfile.h b/aws-cpp-sdk-iam/include/aws/iam/model/LoginProfile.h
index 4f1e96f1b59..d6041369626 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/LoginProfile.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/LoginProfile.h
@@ -37,7 +37,7 @@ namespace Model
   /**
    * <p>Contains the user name and password create date for a user.</p> <p> This data
    * type is used as a response element in the <a>CreateLoginProfile</a> and
-   * <a>GetLoginProfile</a> actions. </p><p><h3>See Also:</h3>   <a
+   * <a>GetLoginProfile</a> operations. </p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/LoginProfile">AWS
    * API Reference</a></p>
    */
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/MFADevice.h b/aws-cpp-sdk-iam/include/aws/iam/model/MFADevice.h
index c874a299d0b..9841a76698e 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/MFADevice.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/MFADevice.h
@@ -36,9 +36,10 @@ namespace Model
 
   /**
    * <p>Contains information about an MFA device.</p> <p>This data type is used as a
-   * response element in the <a>ListMFADevices</a> action.</p><p><h3>See Also:</h3>  
-   * <a href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/MFADevice">AWS
-   * API Reference</a></p>
+   * response element in the <a>ListMFADevices</a> operation.</p><p><h3>See
+   * Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/MFADevice">AWS API
+   * Reference</a></p>
    */
   class AWS_IAM_API MFADevice
   {
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ManagedPolicyDetail.h b/aws-cpp-sdk-iam/include/aws/iam/model/ManagedPolicyDetail.h
index ad8a58d02fd..10e63eaf906 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ManagedPolicyDetail.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ManagedPolicyDetail.h
@@ -40,8 +40,8 @@ namespace Model
    * <p>Contains information about a managed policy, including the policy's ARN,
    * versions, and the number of principal entities (users, groups, and roles) that
    * the policy is attached to.</p> <p>This data type is used as a response element
-   * in the <a>GetAccountAuthorizationDetails</a> action.</p> <p>For more information
-   * about managed policies, see <a
+   * in the <a>GetAccountAuthorizationDetails</a> operation.</p> <p>For more
+   * information about managed policies, see <a
    * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html">Managed
    * Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p><p><h3>See
    * Also:</h3>   <a
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/OrganizationsDecisionDetail.h b/aws-cpp-sdk-iam/include/aws/iam/model/OrganizationsDecisionDetail.h
index a19913c077f..56d3acc6d8b 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/OrganizationsDecisionDetail.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/OrganizationsDecisionDetail.h
@@ -32,7 +32,7 @@ namespace Model
 {
 
   /**
-   * <p>Contains information about AWS Organizations's affect on a policy
+   * <p>Contains information about AWS Organizations's effect on a policy
    * simulation.</p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/OrganizationsDecisionDetail">AWS
    * API Reference</a></p>
@@ -49,19 +49,19 @@ namespace Model
 
 
     /**
-     * <p>Specifies whether the simulated action is allowed by the AWS Organizations
+     * <p>Specifies whether the simulated operation is allowed by the AWS Organizations
      * service control policies that impact the simulated user's account.</p>
      */
     inline bool GetAllowedByOrganizations() const{ return m_allowedByOrganizations; }
 
     /**
-     * <p>Specifies whether the simulated action is allowed by the AWS Organizations
+     * <p>Specifies whether the simulated operation is allowed by the AWS Organizations
      * service control policies that impact the simulated user's account.</p>
      */
     inline void SetAllowedByOrganizations(bool value) { m_allowedByOrganizationsHasBeenSet = true; m_allowedByOrganizations = value; }
 
     /**
-     * <p>Specifies whether the simulated action is allowed by the AWS Organizations
+     * <p>Specifies whether the simulated operation is allowed by the AWS Organizations
      * service control policies that impact the simulated user's account.</p>
      */
     inline OrganizationsDecisionDetail& WithAllowedByOrganizations(bool value) { SetAllowedByOrganizations(value); return *this;}
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/PasswordPolicy.h b/aws-cpp-sdk-iam/include/aws/iam/model/PasswordPolicy.h
index d244808ea48..071a5ab8ef0 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/PasswordPolicy.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/PasswordPolicy.h
@@ -34,7 +34,7 @@ namespace Model
   /**
    * <p>Contains information about the account password policy.</p> <p> This data
    * type is used as a response element in the <a>GetAccountPasswordPolicy</a>
-   * action. </p><p><h3>See Also:</h3>   <a
+   * operation. </p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/PasswordPolicy">AWS
    * API Reference</a></p>
    */
@@ -147,21 +147,21 @@ namespace Model
 
     /**
      * <p>Indicates whether passwords in the account expire. Returns true if
-     * MaxPasswordAge is contains a value greater than 0. Returns false if
+     * <code>MaxPasswordAge</code> contains a value greater than 0. Returns false if
      * MaxPasswordAge is 0 or not present.</p>
      */
     inline bool GetExpirePasswords() const{ return m_expirePasswords; }
 
     /**
      * <p>Indicates whether passwords in the account expire. Returns true if
-     * MaxPasswordAge is contains a value greater than 0. Returns false if
+     * <code>MaxPasswordAge</code> contains a value greater than 0. Returns false if
      * MaxPasswordAge is 0 or not present.</p>
      */
     inline void SetExpirePasswords(bool value) { m_expirePasswordsHasBeenSet = true; m_expirePasswords = value; }
 
     /**
      * <p>Indicates whether passwords in the account expire. Returns true if
-     * MaxPasswordAge is contains a value greater than 0. Returns false if
+     * <code>MaxPasswordAge</code> contains a value greater than 0. Returns false if
      * MaxPasswordAge is 0 or not present.</p>
      */
     inline PasswordPolicy& WithExpirePasswords(bool value) { SetExpirePasswords(value); return *this;}
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/Policy.h b/aws-cpp-sdk-iam/include/aws/iam/model/Policy.h
index 44901957543..d4d97f27e57 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/Policy.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/Policy.h
@@ -37,7 +37,7 @@ namespace Model
   /**
    * <p>Contains information about a managed policy.</p> <p>This data type is used as
    * a response element in the <a>CreatePolicy</a>, <a>GetPolicy</a>, and
-   * <a>ListPolicies</a> actions. </p> <p>For more information about managed
+   * <a>ListPolicies</a> operations. </p> <p>For more information about managed
    * policies, refer to <a
    * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html">Managed
    * Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p><p><h3>See
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/PolicyDetail.h b/aws-cpp-sdk-iam/include/aws/iam/model/PolicyDetail.h
index a5365fb38c5..b3b1460d562 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/PolicyDetail.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/PolicyDetail.h
@@ -36,7 +36,7 @@ namespace Model
   /**
    * <p>Contains information about an IAM policy, including the policy document.</p>
    * <p>This data type is used as a response element in the
-   * <a>GetAccountAuthorizationDetails</a> action.</p><p><h3>See Also:</h3>   <a
+   * <a>GetAccountAuthorizationDetails</a> operation.</p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/PolicyDetail">AWS
    * API Reference</a></p>
    */
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/PolicyGroup.h b/aws-cpp-sdk-iam/include/aws/iam/model/PolicyGroup.h
index 6c2d76efc23..15b4e85966c 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/PolicyGroup.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/PolicyGroup.h
@@ -36,8 +36,8 @@ namespace Model
   /**
    * <p>Contains information about a group that a managed policy is attached to.</p>
    * <p>This data type is used as a response element in the
-   * <a>ListEntitiesForPolicy</a> action. </p> <p>For more information about managed
-   * policies, refer to <a
+   * <a>ListEntitiesForPolicy</a> operation. </p> <p>For more information about
+   * managed policies, refer to <a
    * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html">Managed
    * Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p><p><h3>See
    * Also:</h3>   <a
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/PolicyRole.h b/aws-cpp-sdk-iam/include/aws/iam/model/PolicyRole.h
index d0c454be4d2..38be4246d1a 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/PolicyRole.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/PolicyRole.h
@@ -36,8 +36,8 @@ namespace Model
   /**
    * <p>Contains information about a role that a managed policy is attached to.</p>
    * <p>This data type is used as a response element in the
-   * <a>ListEntitiesForPolicy</a> action. </p> <p>For more information about managed
-   * policies, refer to <a
+   * <a>ListEntitiesForPolicy</a> operation. </p> <p>For more information about
+   * managed policies, refer to <a
    * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html">Managed
    * Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p><p><h3>See
    * Also:</h3>   <a
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/PolicyUser.h b/aws-cpp-sdk-iam/include/aws/iam/model/PolicyUser.h
index 340de4e5d5a..00ffd3f0447 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/PolicyUser.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/PolicyUser.h
@@ -36,8 +36,8 @@ namespace Model
   /**
    * <p>Contains information about a user that a managed policy is attached to.</p>
    * <p>This data type is used as a response element in the
-   * <a>ListEntitiesForPolicy</a> action. </p> <p>For more information about managed
-   * policies, refer to <a
+   * <a>ListEntitiesForPolicy</a> operation. </p> <p>For more information about
+   * managed policies, refer to <a
    * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html">Managed
    * Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p><p><h3>See
    * Also:</h3>   <a
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/PolicyVersion.h b/aws-cpp-sdk-iam/include/aws/iam/model/PolicyVersion.h
index dbcf5d00695..658239a0ae7 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/PolicyVersion.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/PolicyVersion.h
@@ -38,7 +38,7 @@ namespace Model
    * <p>Contains information about a version of a managed policy.</p> <p>This data
    * type is used as a response element in the <a>CreatePolicyVersion</a>,
    * <a>GetPolicyVersion</a>, <a>ListPolicyVersions</a>, and
-   * <a>GetAccountAuthorizationDetails</a> actions. </p> <p>For more information
+   * <a>GetAccountAuthorizationDetails</a> operations. </p> <p>For more information
    * about managed policies, refer to <a
    * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html">Managed
    * Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p><p><h3>See
@@ -61,7 +61,13 @@ namespace Model
      * <p>The policy document.</p> <p>The policy document is returned in the response
      * to the <a>GetPolicyVersion</a> and <a>GetAccountAuthorizationDetails</a>
      * operations. It is not returned in the response to the <a>CreatePolicyVersion</a>
-     * or <a>ListPolicyVersions</a> operations. </p>
+     * or <a>ListPolicyVersions</a> operations. </p> <p>The policy document returned in
+     * this structure is URL-encoded compliant with <a
+     * href="https://tools.ietf.org/html/rfc3986">RFC 3986</a>. You can use a URL
+     * decoding method to convert the policy back to plain JSON text. For example, if
+     * you use Java, you can use the <code>decode</code> method of the
+     * <code>java.net.URLDecoder</code> utility class in the Java SDK. Other languages
+     * and SDKs provide similar functionality.</p>
      */
     inline const Aws::String& GetDocument() const{ return m_document; }
 
@@ -69,7 +75,13 @@ namespace Model
      * <p>The policy document.</p> <p>The policy document is returned in the response
      * to the <a>GetPolicyVersion</a> and <a>GetAccountAuthorizationDetails</a>
      * operations. It is not returned in the response to the <a>CreatePolicyVersion</a>
-     * or <a>ListPolicyVersions</a> operations. </p>
+     * or <a>ListPolicyVersions</a> operations. </p> <p>The policy document returned in
+     * this structure is URL-encoded compliant with <a
+     * href="https://tools.ietf.org/html/rfc3986">RFC 3986</a>. You can use a URL
+     * decoding method to convert the policy back to plain JSON text. For example, if
+     * you use Java, you can use the <code>decode</code> method of the
+     * <code>java.net.URLDecoder</code> utility class in the Java SDK. Other languages
+     * and SDKs provide similar functionality.</p>
      */
     inline void SetDocument(const Aws::String& value) { m_documentHasBeenSet = true; m_document = value; }
 
@@ -77,7 +89,13 @@ namespace Model
      * <p>The policy document.</p> <p>The policy document is returned in the response
      * to the <a>GetPolicyVersion</a> and <a>GetAccountAuthorizationDetails</a>
      * operations. It is not returned in the response to the <a>CreatePolicyVersion</a>
-     * or <a>ListPolicyVersions</a> operations. </p>
+     * or <a>ListPolicyVersions</a> operations. </p> <p>The policy document returned in
+     * this structure is URL-encoded compliant with <a
+     * href="https://tools.ietf.org/html/rfc3986">RFC 3986</a>. You can use a URL
+     * decoding method to convert the policy back to plain JSON text. For example, if
+     * you use Java, you can use the <code>decode</code> method of the
+     * <code>java.net.URLDecoder</code> utility class in the Java SDK. Other languages
+     * and SDKs provide similar functionality.</p>
      */
     inline void SetDocument(Aws::String&& value) { m_documentHasBeenSet = true; m_document = std::move(value); }
 
@@ -85,7 +103,13 @@ namespace Model
      * <p>The policy document.</p> <p>The policy document is returned in the response
      * to the <a>GetPolicyVersion</a> and <a>GetAccountAuthorizationDetails</a>
      * operations. It is not returned in the response to the <a>CreatePolicyVersion</a>
-     * or <a>ListPolicyVersions</a> operations. </p>
+     * or <a>ListPolicyVersions</a> operations. </p> <p>The policy document returned in
+     * this structure is URL-encoded compliant with <a
+     * href="https://tools.ietf.org/html/rfc3986">RFC 3986</a>. You can use a URL
+     * decoding method to convert the policy back to plain JSON text. For example, if
+     * you use Java, you can use the <code>decode</code> method of the
+     * <code>java.net.URLDecoder</code> utility class in the Java SDK. Other languages
+     * and SDKs provide similar functionality.</p>
      */
     inline void SetDocument(const char* value) { m_documentHasBeenSet = true; m_document.assign(value); }
 
@@ -93,7 +117,13 @@ namespace Model
      * <p>The policy document.</p> <p>The policy document is returned in the response
      * to the <a>GetPolicyVersion</a> and <a>GetAccountAuthorizationDetails</a>
      * operations. It is not returned in the response to the <a>CreatePolicyVersion</a>
-     * or <a>ListPolicyVersions</a> operations. </p>
+     * or <a>ListPolicyVersions</a> operations. </p> <p>The policy document returned in
+     * this structure is URL-encoded compliant with <a
+     * href="https://tools.ietf.org/html/rfc3986">RFC 3986</a>. You can use a URL
+     * decoding method to convert the policy back to plain JSON text. For example, if
+     * you use Java, you can use the <code>decode</code> method of the
+     * <code>java.net.URLDecoder</code> utility class in the Java SDK. Other languages
+     * and SDKs provide similar functionality.</p>
      */
     inline PolicyVersion& WithDocument(const Aws::String& value) { SetDocument(value); return *this;}
 
@@ -101,7 +131,13 @@ namespace Model
      * <p>The policy document.</p> <p>The policy document is returned in the response
      * to the <a>GetPolicyVersion</a> and <a>GetAccountAuthorizationDetails</a>
      * operations. It is not returned in the response to the <a>CreatePolicyVersion</a>
-     * or <a>ListPolicyVersions</a> operations. </p>
+     * or <a>ListPolicyVersions</a> operations. </p> <p>The policy document returned in
+     * this structure is URL-encoded compliant with <a
+     * href="https://tools.ietf.org/html/rfc3986">RFC 3986</a>. You can use a URL
+     * decoding method to convert the policy back to plain JSON text. For example, if
+     * you use Java, you can use the <code>decode</code> method of the
+     * <code>java.net.URLDecoder</code> utility class in the Java SDK. Other languages
+     * and SDKs provide similar functionality.</p>
      */
     inline PolicyVersion& WithDocument(Aws::String&& value) { SetDocument(std::move(value)); return *this;}
 
@@ -109,7 +145,13 @@ namespace Model
      * <p>The policy document.</p> <p>The policy document is returned in the response
      * to the <a>GetPolicyVersion</a> and <a>GetAccountAuthorizationDetails</a>
      * operations. It is not returned in the response to the <a>CreatePolicyVersion</a>
-     * or <a>ListPolicyVersions</a> operations. </p>
+     * or <a>ListPolicyVersions</a> operations. </p> <p>The policy document returned in
+     * this structure is URL-encoded compliant with <a
+     * href="https://tools.ietf.org/html/rfc3986">RFC 3986</a>. You can use a URL
+     * decoding method to convert the policy back to plain JSON text. For example, if
+     * you use Java, you can use the <code>decode</code> method of the
+     * <code>java.net.URLDecoder</code> utility class in the Java SDK. Other languages
+     * and SDKs provide similar functionality.</p>
      */
     inline PolicyVersion& WithDocument(const char* value) { SetDocument(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/PutGroupPolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/PutGroupPolicyRequest.h
index 5a4f28e5c2d..5401343c488 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/PutGroupPolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/PutGroupPolicyRequest.h
@@ -50,7 +50,8 @@ namespace Model
      * <p>The name of the group to associate the policy with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline const Aws::String& GetGroupName() const{ return m_groupName; }
 
@@ -58,7 +59,8 @@ namespace Model
      * <p>The name of the group to associate the policy with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetGroupName(const Aws::String& value) { m_groupNameHasBeenSet = true; m_groupName = value; }
 
@@ -66,7 +68,8 @@ namespace Model
      * <p>The name of the group to associate the policy with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetGroupName(Aws::String&& value) { m_groupNameHasBeenSet = true; m_groupName = std::move(value); }
 
@@ -74,7 +77,8 @@ namespace Model
      * <p>The name of the group to associate the policy with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetGroupName(const char* value) { m_groupNameHasBeenSet = true; m_groupName.assign(value); }
 
@@ -82,7 +86,8 @@ namespace Model
      * <p>The name of the group to associate the policy with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline PutGroupPolicyRequest& WithGroupName(const Aws::String& value) { SetGroupName(value); return *this;}
 
@@ -90,7 +95,8 @@ namespace Model
      * <p>The name of the group to associate the policy with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline PutGroupPolicyRequest& WithGroupName(Aws::String&& value) { SetGroupName(std::move(value)); return *this;}
 
@@ -98,7 +104,8 @@ namespace Model
      * <p>The name of the group to associate the policy with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline PutGroupPolicyRequest& WithGroupName(const char* value) { SetGroupName(value); return *this;}
 
@@ -107,7 +114,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetPolicyName() const{ return m_policyName; }
 
@@ -115,7 +122,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(const Aws::String& value) { m_policyNameHasBeenSet = true; m_policyName = value; }
 
@@ -123,7 +130,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(Aws::String&& value) { m_policyNameHasBeenSet = true; m_policyName = std::move(value); }
 
@@ -131,7 +138,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(const char* value) { m_policyNameHasBeenSet = true; m_policyName.assign(value); }
 
@@ -139,7 +146,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline PutGroupPolicyRequest& WithPolicyName(const Aws::String& value) { SetPolicyName(value); return *this;}
 
@@ -147,7 +154,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline PutGroupPolicyRequest& WithPolicyName(Aws::String&& value) { SetPolicyName(std::move(value)); return *this;}
 
@@ -155,7 +162,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline PutGroupPolicyRequest& WithPolicyName(const char* value) { SetPolicyName(value); return *this;}
 
@@ -163,77 +170,84 @@ namespace Model
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline const Aws::String& GetPolicyDocument() const{ return m_policyDocument; }
 
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyDocument(const Aws::String& value) { m_policyDocumentHasBeenSet = true; m_policyDocument = value; }
 
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyDocument(Aws::String&& value) { m_policyDocumentHasBeenSet = true; m_policyDocument = std::move(value); }
 
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyDocument(const char* value) { m_policyDocumentHasBeenSet = true; m_policyDocument.assign(value); }
 
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline PutGroupPolicyRequest& WithPolicyDocument(const Aws::String& value) { SetPolicyDocument(value); return *this;}
 
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline PutGroupPolicyRequest& WithPolicyDocument(Aws::String&& value) { SetPolicyDocument(std::move(value)); return *this;}
 
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline PutGroupPolicyRequest& WithPolicyDocument(const char* value) { SetPolicyDocument(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/PutRolePolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/PutRolePolicyRequest.h
index 8f027e7c2f8..6751a8e4657 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/PutRolePolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/PutRolePolicyRequest.h
@@ -114,7 +114,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetPolicyName() const{ return m_policyName; }
 
@@ -122,7 +122,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(const Aws::String& value) { m_policyNameHasBeenSet = true; m_policyName = value; }
 
@@ -130,7 +130,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(Aws::String&& value) { m_policyNameHasBeenSet = true; m_policyName = std::move(value); }
 
@@ -138,7 +138,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(const char* value) { m_policyNameHasBeenSet = true; m_policyName.assign(value); }
 
@@ -146,7 +146,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline PutRolePolicyRequest& WithPolicyName(const Aws::String& value) { SetPolicyName(value); return *this;}
 
@@ -154,7 +154,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline PutRolePolicyRequest& WithPolicyName(Aws::String&& value) { SetPolicyName(std::move(value)); return *this;}
 
@@ -162,7 +162,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline PutRolePolicyRequest& WithPolicyName(const char* value) { SetPolicyName(value); return *this;}
 
@@ -170,77 +170,84 @@ namespace Model
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline const Aws::String& GetPolicyDocument() const{ return m_policyDocument; }
 
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyDocument(const Aws::String& value) { m_policyDocumentHasBeenSet = true; m_policyDocument = value; }
 
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyDocument(Aws::String&& value) { m_policyDocumentHasBeenSet = true; m_policyDocument = std::move(value); }
 
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyDocument(const char* value) { m_policyDocumentHasBeenSet = true; m_policyDocument.assign(value); }
 
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline PutRolePolicyRequest& WithPolicyDocument(const Aws::String& value) { SetPolicyDocument(value); return *this;}
 
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline PutRolePolicyRequest& WithPolicyDocument(Aws::String&& value) { SetPolicyDocument(std::move(value)); return *this;}
 
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline PutRolePolicyRequest& WithPolicyDocument(const char* value) { SetPolicyDocument(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/PutUserPolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/PutUserPolicyRequest.h
index 4039ce5f7e9..e7d96cb7675 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/PutUserPolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/PutUserPolicyRequest.h
@@ -50,7 +50,8 @@ namespace Model
      * <p>The name of the user to associate the policy with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -58,7 +59,8 @@ namespace Model
      * <p>The name of the user to associate the policy with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -66,7 +68,8 @@ namespace Model
      * <p>The name of the user to associate the policy with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -74,7 +77,8 @@ namespace Model
      * <p>The name of the user to associate the policy with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -82,7 +86,8 @@ namespace Model
      * <p>The name of the user to associate the policy with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline PutUserPolicyRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -90,7 +95,8 @@ namespace Model
      * <p>The name of the user to associate the policy with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline PutUserPolicyRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -98,7 +104,8 @@ namespace Model
      * <p>The name of the user to associate the policy with.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline PutUserPolicyRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
@@ -107,7 +114,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetPolicyName() const{ return m_policyName; }
 
@@ -115,7 +122,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(const Aws::String& value) { m_policyNameHasBeenSet = true; m_policyName = value; }
 
@@ -123,7 +130,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(Aws::String&& value) { m_policyNameHasBeenSet = true; m_policyName = std::move(value); }
 
@@ -131,7 +138,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetPolicyName(const char* value) { m_policyNameHasBeenSet = true; m_policyName.assign(value); }
 
@@ -139,7 +146,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline PutUserPolicyRequest& WithPolicyName(const Aws::String& value) { SetPolicyName(value); return *this;}
 
@@ -147,7 +154,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline PutUserPolicyRequest& WithPolicyName(Aws::String&& value) { SetPolicyName(std::move(value)); return *this;}
 
@@ -155,7 +162,7 @@ namespace Model
      * <p>The name of the policy document.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-+</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline PutUserPolicyRequest& WithPolicyName(const char* value) { SetPolicyName(value); return *this;}
 
@@ -163,77 +170,84 @@ namespace Model
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline const Aws::String& GetPolicyDocument() const{ return m_policyDocument; }
 
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyDocument(const Aws::String& value) { m_policyDocumentHasBeenSet = true; m_policyDocument = value; }
 
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyDocument(Aws::String&& value) { m_policyDocumentHasBeenSet = true; m_policyDocument = std::move(value); }
 
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyDocument(const char* value) { m_policyDocumentHasBeenSet = true; m_policyDocument.assign(value); }
 
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline PutUserPolicyRequest& WithPolicyDocument(const Aws::String& value) { SetPolicyDocument(value); return *this;}
 
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline PutUserPolicyRequest& WithPolicyDocument(Aws::String&& value) { SetPolicyDocument(std::move(value)); return *this;}
 
     /**
      * <p>The policy document.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline PutUserPolicyRequest& WithPolicyDocument(const char* value) { SetPolicyDocument(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/RemoveClientIDFromOpenIDConnectProviderRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/RemoveClientIDFromOpenIDConnectProviderRequest.h
index 570fb579ecb..7e961bb0ace 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/RemoveClientIDFromOpenIDConnectProviderRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/RemoveClientIDFromOpenIDConnectProviderRequest.h
@@ -49,7 +49,7 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OIDC provider resource to remove
      * the client ID from. You can get a list of OIDC provider ARNs by using the
-     * <a>ListOpenIDConnectProviders</a> action.</p> <p>For more information about
+     * <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more information about
      * ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
@@ -60,7 +60,7 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OIDC provider resource to remove
      * the client ID from. You can get a list of OIDC provider ARNs by using the
-     * <a>ListOpenIDConnectProviders</a> action.</p> <p>For more information about
+     * <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more information about
      * ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
@@ -71,7 +71,7 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OIDC provider resource to remove
      * the client ID from. You can get a list of OIDC provider ARNs by using the
-     * <a>ListOpenIDConnectProviders</a> action.</p> <p>For more information about
+     * <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more information about
      * ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
@@ -82,7 +82,7 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OIDC provider resource to remove
      * the client ID from. You can get a list of OIDC provider ARNs by using the
-     * <a>ListOpenIDConnectProviders</a> action.</p> <p>For more information about
+     * <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more information about
      * ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
@@ -93,7 +93,7 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OIDC provider resource to remove
      * the client ID from. You can get a list of OIDC provider ARNs by using the
-     * <a>ListOpenIDConnectProviders</a> action.</p> <p>For more information about
+     * <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more information about
      * ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
@@ -104,7 +104,7 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OIDC provider resource to remove
      * the client ID from. You can get a list of OIDC provider ARNs by using the
-     * <a>ListOpenIDConnectProviders</a> action.</p> <p>For more information about
+     * <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more information about
      * ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
@@ -115,7 +115,7 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OIDC provider resource to remove
      * the client ID from. You can get a list of OIDC provider ARNs by using the
-     * <a>ListOpenIDConnectProviders</a> action.</p> <p>For more information about
+     * <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more information about
      * ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/RemoveRoleFromInstanceProfileRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/RemoveRoleFromInstanceProfileRequest.h
index 57f38c5a640..23948054c1b 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/RemoveRoleFromInstanceProfileRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/RemoveRoleFromInstanceProfileRequest.h
@@ -50,7 +50,7 @@ namespace Model
      * <p>The name of the instance profile to update.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetInstanceProfileName() const{ return m_instanceProfileName; }
 
@@ -58,7 +58,7 @@ namespace Model
      * <p>The name of the instance profile to update.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetInstanceProfileName(const Aws::String& value) { m_instanceProfileNameHasBeenSet = true; m_instanceProfileName = value; }
 
@@ -66,7 +66,7 @@ namespace Model
      * <p>The name of the instance profile to update.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetInstanceProfileName(Aws::String&& value) { m_instanceProfileNameHasBeenSet = true; m_instanceProfileName = std::move(value); }
 
@@ -74,7 +74,7 @@ namespace Model
      * <p>The name of the instance profile to update.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetInstanceProfileName(const char* value) { m_instanceProfileNameHasBeenSet = true; m_instanceProfileName.assign(value); }
 
@@ -82,7 +82,7 @@ namespace Model
      * <p>The name of the instance profile to update.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline RemoveRoleFromInstanceProfileRequest& WithInstanceProfileName(const Aws::String& value) { SetInstanceProfileName(value); return *this;}
 
@@ -90,7 +90,7 @@ namespace Model
      * <p>The name of the instance profile to update.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline RemoveRoleFromInstanceProfileRequest& WithInstanceProfileName(Aws::String&& value) { SetInstanceProfileName(std::move(value)); return *this;}
 
@@ -98,7 +98,7 @@ namespace Model
      * <p>The name of the instance profile to update.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline RemoveRoleFromInstanceProfileRequest& WithInstanceProfileName(const char* value) { SetInstanceProfileName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/RemoveUserFromGroupRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/RemoveUserFromGroupRequest.h
index 2e8e43874c8..95a28943754 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/RemoveUserFromGroupRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/RemoveUserFromGroupRequest.h
@@ -50,7 +50,7 @@ namespace Model
      * <p>The name of the group to update.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetGroupName() const{ return m_groupName; }
 
@@ -58,7 +58,7 @@ namespace Model
      * <p>The name of the group to update.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const Aws::String& value) { m_groupNameHasBeenSet = true; m_groupName = value; }
 
@@ -66,7 +66,7 @@ namespace Model
      * <p>The name of the group to update.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(Aws::String&& value) { m_groupNameHasBeenSet = true; m_groupName = std::move(value); }
 
@@ -74,7 +74,7 @@ namespace Model
      * <p>The name of the group to update.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const char* value) { m_groupNameHasBeenSet = true; m_groupName.assign(value); }
 
@@ -82,7 +82,7 @@ namespace Model
      * <p>The name of the group to update.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline RemoveUserFromGroupRequest& WithGroupName(const Aws::String& value) { SetGroupName(value); return *this;}
 
@@ -90,7 +90,7 @@ namespace Model
      * <p>The name of the group to update.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline RemoveUserFromGroupRequest& WithGroupName(Aws::String&& value) { SetGroupName(std::move(value)); return *this;}
 
@@ -98,7 +98,7 @@ namespace Model
      * <p>The name of the group to update.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline RemoveUserFromGroupRequest& WithGroupName(const char* value) { SetGroupName(value); return *this;}
 
@@ -107,7 +107,7 @@ namespace Model
      * <p>The name of the user to remove.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -115,7 +115,7 @@ namespace Model
      * <p>The name of the user to remove.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -123,7 +123,7 @@ namespace Model
      * <p>The name of the user to remove.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -131,7 +131,7 @@ namespace Model
      * <p>The name of the user to remove.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -139,7 +139,7 @@ namespace Model
      * <p>The name of the user to remove.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline RemoveUserFromGroupRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -147,7 +147,7 @@ namespace Model
      * <p>The name of the user to remove.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline RemoveUserFromGroupRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -155,7 +155,7 @@ namespace Model
      * <p>The name of the user to remove.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline RemoveUserFromGroupRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ResetServiceSpecificCredentialRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ResetServiceSpecificCredentialRequest.h
index 05c17fbfd0b..bde18364a70 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ResetServiceSpecificCredentialRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ResetServiceSpecificCredentialRequest.h
@@ -52,7 +52,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -62,7 +62,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -72,7 +72,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -82,7 +82,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -92,7 +92,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline ResetServiceSpecificCredentialRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -102,7 +102,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline ResetServiceSpecificCredentialRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -112,7 +112,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline ResetServiceSpecificCredentialRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ResourceSpecificResult.h b/aws-cpp-sdk-iam/include/aws/iam/model/ResourceSpecificResult.h
index bc00994f656..488a901b93e 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ResourceSpecificResult.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ResourceSpecificResult.h
@@ -38,8 +38,8 @@ namespace Model
 {
 
   /**
-   * <p>Contains the result of the simulation of a single API action call on a single
-   * resource.</p> <p>This data type is used by a member of the
+   * <p>Contains the result of the simulation of a single API operation call on a
+   * single resource.</p> <p>This data type is used by a member of the
    * <a>EvaluationResult</a> data type.</p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ResourceSpecificResult">AWS
    * API Reference</a></p>
@@ -92,31 +92,31 @@ namespace Model
 
 
     /**
-     * <p>The result of the simulation of the simulated API action on the resource
+     * <p>The result of the simulation of the simulated API operation on the resource
      * specified in <code>EvalResourceName</code>.</p>
      */
     inline const PolicyEvaluationDecisionType& GetEvalResourceDecision() const{ return m_evalResourceDecision; }
 
     /**
-     * <p>The result of the simulation of the simulated API action on the resource
+     * <p>The result of the simulation of the simulated API operation on the resource
      * specified in <code>EvalResourceName</code>.</p>
      */
     inline void SetEvalResourceDecision(const PolicyEvaluationDecisionType& value) { m_evalResourceDecisionHasBeenSet = true; m_evalResourceDecision = value; }
 
     /**
-     * <p>The result of the simulation of the simulated API action on the resource
+     * <p>The result of the simulation of the simulated API operation on the resource
      * specified in <code>EvalResourceName</code>.</p>
      */
     inline void SetEvalResourceDecision(PolicyEvaluationDecisionType&& value) { m_evalResourceDecisionHasBeenSet = true; m_evalResourceDecision = std::move(value); }
 
     /**
-     * <p>The result of the simulation of the simulated API action on the resource
+     * <p>The result of the simulation of the simulated API operation on the resource
      * specified in <code>EvalResourceName</code>.</p>
      */
     inline ResourceSpecificResult& WithEvalResourceDecision(const PolicyEvaluationDecisionType& value) { SetEvalResourceDecision(value); return *this;}
 
     /**
-     * <p>The result of the simulation of the simulated API action on the resource
+     * <p>The result of the simulation of the simulated API operation on the resource
      * specified in <code>EvalResourceName</code>.</p>
      */
     inline ResourceSpecificResult& WithEvalResourceDecision(PolicyEvaluationDecisionType&& value) { SetEvalResourceDecision(std::move(value)); return *this;}
@@ -125,8 +125,8 @@ namespace Model
     /**
      * <p>A list of the statements in the input policies that determine the result for
      * this part of the simulation. Remember that even if multiple statements allow the
-     * action on the resource, if <i>any</i> statement denies that action, then the
-     * explicit deny overrides any allow, and the deny statement is the only entry
+     * operation on the resource, if <i>any</i> statement denies that operation, then
+     * the explicit deny overrides any allow, and the deny statement is the only entry
      * included in the result.</p>
      */
     inline const Aws::Vector<Statement>& GetMatchedStatements() const{ return m_matchedStatements; }
@@ -134,8 +134,8 @@ namespace Model
     /**
      * <p>A list of the statements in the input policies that determine the result for
      * this part of the simulation. Remember that even if multiple statements allow the
-     * action on the resource, if <i>any</i> statement denies that action, then the
-     * explicit deny overrides any allow, and the deny statement is the only entry
+     * operation on the resource, if <i>any</i> statement denies that operation, then
+     * the explicit deny overrides any allow, and the deny statement is the only entry
      * included in the result.</p>
      */
     inline void SetMatchedStatements(const Aws::Vector<Statement>& value) { m_matchedStatementsHasBeenSet = true; m_matchedStatements = value; }
@@ -143,8 +143,8 @@ namespace Model
     /**
      * <p>A list of the statements in the input policies that determine the result for
      * this part of the simulation. Remember that even if multiple statements allow the
-     * action on the resource, if <i>any</i> statement denies that action, then the
-     * explicit deny overrides any allow, and the deny statement is the only entry
+     * operation on the resource, if <i>any</i> statement denies that operation, then
+     * the explicit deny overrides any allow, and the deny statement is the only entry
      * included in the result.</p>
      */
     inline void SetMatchedStatements(Aws::Vector<Statement>&& value) { m_matchedStatementsHasBeenSet = true; m_matchedStatements = std::move(value); }
@@ -152,8 +152,8 @@ namespace Model
     /**
      * <p>A list of the statements in the input policies that determine the result for
      * this part of the simulation. Remember that even if multiple statements allow the
-     * action on the resource, if <i>any</i> statement denies that action, then the
-     * explicit deny overrides any allow, and the deny statement is the only entry
+     * operation on the resource, if <i>any</i> statement denies that operation, then
+     * the explicit deny overrides any allow, and the deny statement is the only entry
      * included in the result.</p>
      */
     inline ResourceSpecificResult& WithMatchedStatements(const Aws::Vector<Statement>& value) { SetMatchedStatements(value); return *this;}
@@ -161,8 +161,8 @@ namespace Model
     /**
      * <p>A list of the statements in the input policies that determine the result for
      * this part of the simulation. Remember that even if multiple statements allow the
-     * action on the resource, if <i>any</i> statement denies that action, then the
-     * explicit deny overrides any allow, and the deny statement is the only entry
+     * operation on the resource, if <i>any</i> statement denies that operation, then
+     * the explicit deny overrides any allow, and the deny statement is the only entry
      * included in the result.</p>
      */
     inline ResourceSpecificResult& WithMatchedStatements(Aws::Vector<Statement>&& value) { SetMatchedStatements(std::move(value)); return *this;}
@@ -170,8 +170,8 @@ namespace Model
     /**
      * <p>A list of the statements in the input policies that determine the result for
      * this part of the simulation. Remember that even if multiple statements allow the
-     * action on the resource, if <i>any</i> statement denies that action, then the
-     * explicit deny overrides any allow, and the deny statement is the only entry
+     * operation on the resource, if <i>any</i> statement denies that operation, then
+     * the explicit deny overrides any allow, and the deny statement is the only entry
      * included in the result.</p>
      */
     inline ResourceSpecificResult& AddMatchedStatements(const Statement& value) { m_matchedStatementsHasBeenSet = true; m_matchedStatements.push_back(value); return *this; }
@@ -179,8 +179,8 @@ namespace Model
     /**
      * <p>A list of the statements in the input policies that determine the result for
      * this part of the simulation. Remember that even if multiple statements allow the
-     * action on the resource, if <i>any</i> statement denies that action, then the
-     * explicit deny overrides any allow, and the deny statement is the only entry
+     * operation on the resource, if <i>any</i> statement denies that operation, then
+     * the explicit deny overrides any allow, and the deny statement is the only entry
      * included in the result.</p>
      */
     inline ResourceSpecificResult& AddMatchedStatements(Statement&& value) { m_matchedStatementsHasBeenSet = true; m_matchedStatements.push_back(std::move(value)); return *this; }
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ResyncMFADeviceRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/ResyncMFADeviceRequest.h
index a4942d510de..bd965536e71 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ResyncMFADeviceRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ResyncMFADeviceRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline ResyncMFADeviceRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline ResyncMFADeviceRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline ResyncMFADeviceRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
@@ -114,7 +114,8 @@ namespace Model
      * <p>Serial number that uniquely identifies the MFA device.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline const Aws::String& GetSerialNumber() const{ return m_serialNumber; }
 
@@ -122,7 +123,8 @@ namespace Model
      * <p>Serial number that uniquely identifies the MFA device.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetSerialNumber(const Aws::String& value) { m_serialNumberHasBeenSet = true; m_serialNumber = value; }
 
@@ -130,7 +132,8 @@ namespace Model
      * <p>Serial number that uniquely identifies the MFA device.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetSerialNumber(Aws::String&& value) { m_serialNumberHasBeenSet = true; m_serialNumber = std::move(value); }
 
@@ -138,7 +141,8 @@ namespace Model
      * <p>Serial number that uniquely identifies the MFA device.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetSerialNumber(const char* value) { m_serialNumberHasBeenSet = true; m_serialNumber.assign(value); }
 
@@ -146,7 +150,8 @@ namespace Model
      * <p>Serial number that uniquely identifies the MFA device.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline ResyncMFADeviceRequest& WithSerialNumber(const Aws::String& value) { SetSerialNumber(value); return *this;}
 
@@ -154,7 +159,8 @@ namespace Model
      * <p>Serial number that uniquely identifies the MFA device.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline ResyncMFADeviceRequest& WithSerialNumber(Aws::String&& value) { SetSerialNumber(std::move(value)); return *this;}
 
@@ -162,7 +168,8 @@ namespace Model
      * <p>Serial number that uniquely identifies the MFA device.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline ResyncMFADeviceRequest& WithSerialNumber(const char* value) { SetSerialNumber(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/Role.h b/aws-cpp-sdk-iam/include/aws/iam/model/Role.h
index 95d3886e837..f641e13111c 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/Role.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/Role.h
@@ -36,8 +36,8 @@ namespace Model
 
   /**
    * <p>Contains information about an IAM role. This structure is returned as a
-   * response element in several APIs that interact with roles.</p><p><h3>See
-   * Also:</h3>   <a
+   * response element in several API operations that interact with
+   * roles.</p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/Role">AWS API
    * Reference</a></p>
    */
@@ -354,6 +354,31 @@ namespace Model
      */
     inline Role& WithDescription(const char* value) { SetDescription(value); return *this;}
 
+
+    /**
+     * <p>The maximum session duration (in seconds) for the specified role. Anyone who
+     * uses the AWS CLI or API to assume the role can specify the duration using the
+     * optional <code>DurationSeconds</code> API parameter or
+     * <code>duration-seconds</code> CLI parameter.</p>
+     */
+    inline int GetMaxSessionDuration() const{ return m_maxSessionDuration; }
+
+    /**
+     * <p>The maximum session duration (in seconds) for the specified role. Anyone who
+     * uses the AWS CLI or API to assume the role can specify the duration using the
+     * optional <code>DurationSeconds</code> API parameter or
+     * <code>duration-seconds</code> CLI parameter.</p>
+     */
+    inline void SetMaxSessionDuration(int value) { m_maxSessionDurationHasBeenSet = true; m_maxSessionDuration = value; }
+
+    /**
+     * <p>The maximum session duration (in seconds) for the specified role. Anyone who
+     * uses the AWS CLI or API to assume the role can specify the duration using the
+     * optional <code>DurationSeconds</code> API parameter or
+     * <code>duration-seconds</code> CLI parameter.</p>
+     */
+    inline Role& WithMaxSessionDuration(int value) { SetMaxSessionDuration(value); return *this;}
+
   private:
 
     Aws::String m_path;
@@ -376,6 +401,9 @@ namespace Model
 
     Aws::String m_description;
     bool m_descriptionHasBeenSet;
+
+    int m_maxSessionDuration;
+    bool m_maxSessionDurationHasBeenSet;
   };
 
 } // namespace Model
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/RoleDetail.h b/aws-cpp-sdk-iam/include/aws/iam/model/RoleDetail.h
index 585084520ed..20928e3bffe 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/RoleDetail.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/RoleDetail.h
@@ -41,7 +41,7 @@ namespace Model
   /**
    * <p>Contains information about an IAM role, including all of the role's
    * policies.</p> <p>This data type is used as a response element in the
-   * <a>GetAccountAuthorizationDetails</a> action.</p><p><h3>See Also:</h3>   <a
+   * <a>GetAccountAuthorizationDetails</a> operation.</p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/RoleDetail">AWS API
    * Reference</a></p>
    */
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/RoleUsageType.h b/aws-cpp-sdk-iam/include/aws/iam/model/RoleUsageType.h
index 53d0efd1878..18cb6bd7d32 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/RoleUsageType.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/RoleUsageType.h
@@ -35,10 +35,10 @@ namespace Model
 {
 
   /**
-   * <p>An object that contains details about how a service-linked role is used.</p>
-   * <p>This data type is used as a response element in the
-   * <a>GetServiceLinkedRoleDeletionStatus</a> operation.</p><p><h3>See Also:</h3>  
-   * <a
+   * <p>An object that contains details about how a service-linked role is used, if
+   * that information is returned by the service.</p> <p>This data type is used as a
+   * response element in the <a>GetServiceLinkedRoleDeletionStatus</a>
+   * operation.</p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/RoleUsageType">AWS
    * API Reference</a></p>
    */
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/SSHPublicKey.h b/aws-cpp-sdk-iam/include/aws/iam/model/SSHPublicKey.h
index e94339f63e3..48eb33d542c 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/SSHPublicKey.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/SSHPublicKey.h
@@ -38,7 +38,7 @@ namespace Model
   /**
    * <p>Contains information about an SSH public key.</p> <p>This data type is used
    * as a response element in the <a>GetSSHPublicKey</a> and
-   * <a>UploadSSHPublicKey</a> actions. </p><p><h3>See Also:</h3>   <a
+   * <a>UploadSSHPublicKey</a> operations. </p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/SSHPublicKey">AWS
    * API Reference</a></p>
    */
@@ -198,37 +198,37 @@ namespace Model
 
 
     /**
-     * <p>The status of the SSH public key. <code>Active</code> means the key can be
-     * used for authentication with an AWS CodeCommit repository. <code>Inactive</code>
-     * means the key cannot be used.</p>
+     * <p>The status of the SSH public key. <code>Active</code> means that the key can
+     * be used for authentication with an AWS CodeCommit repository.
+     * <code>Inactive</code> means that the key cannot be used.</p>
      */
     inline const StatusType& GetStatus() const{ return m_status; }
 
     /**
-     * <p>The status of the SSH public key. <code>Active</code> means the key can be
-     * used for authentication with an AWS CodeCommit repository. <code>Inactive</code>
-     * means the key cannot be used.</p>
+     * <p>The status of the SSH public key. <code>Active</code> means that the key can
+     * be used for authentication with an AWS CodeCommit repository.
+     * <code>Inactive</code> means that the key cannot be used.</p>
      */
     inline void SetStatus(const StatusType& value) { m_statusHasBeenSet = true; m_status = value; }
 
     /**
-     * <p>The status of the SSH public key. <code>Active</code> means the key can be
-     * used for authentication with an AWS CodeCommit repository. <code>Inactive</code>
-     * means the key cannot be used.</p>
+     * <p>The status of the SSH public key. <code>Active</code> means that the key can
+     * be used for authentication with an AWS CodeCommit repository.
+     * <code>Inactive</code> means that the key cannot be used.</p>
      */
     inline void SetStatus(StatusType&& value) { m_statusHasBeenSet = true; m_status = std::move(value); }
 
     /**
-     * <p>The status of the SSH public key. <code>Active</code> means the key can be
-     * used for authentication with an AWS CodeCommit repository. <code>Inactive</code>
-     * means the key cannot be used.</p>
+     * <p>The status of the SSH public key. <code>Active</code> means that the key can
+     * be used for authentication with an AWS CodeCommit repository.
+     * <code>Inactive</code> means that the key cannot be used.</p>
      */
     inline SSHPublicKey& WithStatus(const StatusType& value) { SetStatus(value); return *this;}
 
     /**
-     * <p>The status of the SSH public key. <code>Active</code> means the key can be
-     * used for authentication with an AWS CodeCommit repository. <code>Inactive</code>
-     * means the key cannot be used.</p>
+     * <p>The status of the SSH public key. <code>Active</code> means that the key can
+     * be used for authentication with an AWS CodeCommit repository.
+     * <code>Inactive</code> means that the key cannot be used.</p>
      */
     inline SSHPublicKey& WithStatus(StatusType&& value) { SetStatus(std::move(value)); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/SSHPublicKeyMetadata.h b/aws-cpp-sdk-iam/include/aws/iam/model/SSHPublicKeyMetadata.h
index e42903f1da0..87967581d44 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/SSHPublicKeyMetadata.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/SSHPublicKeyMetadata.h
@@ -38,7 +38,7 @@ namespace Model
   /**
    * <p>Contains information about an SSH public key, without the key's body or
    * fingerprint.</p> <p>This data type is used as a response element in the
-   * <a>ListSSHPublicKeys</a> action.</p><p><h3>See Also:</h3>   <a
+   * <a>ListSSHPublicKeys</a> operation.</p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/SSHPublicKeyMetadata">AWS
    * API Reference</a></p>
    */
@@ -126,37 +126,37 @@ namespace Model
 
 
     /**
-     * <p>The status of the SSH public key. <code>Active</code> means the key can be
-     * used for authentication with an AWS CodeCommit repository. <code>Inactive</code>
-     * means the key cannot be used.</p>
+     * <p>The status of the SSH public key. <code>Active</code> means that the key can
+     * be used for authentication with an AWS CodeCommit repository.
+     * <code>Inactive</code> means that the key cannot be used.</p>
      */
     inline const StatusType& GetStatus() const{ return m_status; }
 
     /**
-     * <p>The status of the SSH public key. <code>Active</code> means the key can be
-     * used for authentication with an AWS CodeCommit repository. <code>Inactive</code>
-     * means the key cannot be used.</p>
+     * <p>The status of the SSH public key. <code>Active</code> means that the key can
+     * be used for authentication with an AWS CodeCommit repository.
+     * <code>Inactive</code> means that the key cannot be used.</p>
      */
     inline void SetStatus(const StatusType& value) { m_statusHasBeenSet = true; m_status = value; }
 
     /**
-     * <p>The status of the SSH public key. <code>Active</code> means the key can be
-     * used for authentication with an AWS CodeCommit repository. <code>Inactive</code>
-     * means the key cannot be used.</p>
+     * <p>The status of the SSH public key. <code>Active</code> means that the key can
+     * be used for authentication with an AWS CodeCommit repository.
+     * <code>Inactive</code> means that the key cannot be used.</p>
      */
     inline void SetStatus(StatusType&& value) { m_statusHasBeenSet = true; m_status = std::move(value); }
 
     /**
-     * <p>The status of the SSH public key. <code>Active</code> means the key can be
-     * used for authentication with an AWS CodeCommit repository. <code>Inactive</code>
-     * means the key cannot be used.</p>
+     * <p>The status of the SSH public key. <code>Active</code> means that the key can
+     * be used for authentication with an AWS CodeCommit repository.
+     * <code>Inactive</code> means that the key cannot be used.</p>
      */
     inline SSHPublicKeyMetadata& WithStatus(const StatusType& value) { SetStatus(value); return *this;}
 
     /**
-     * <p>The status of the SSH public key. <code>Active</code> means the key can be
-     * used for authentication with an AWS CodeCommit repository. <code>Inactive</code>
-     * means the key cannot be used.</p>
+     * <p>The status of the SSH public key. <code>Active</code> means that the key can
+     * be used for authentication with an AWS CodeCommit repository.
+     * <code>Inactive</code> means that the key cannot be used.</p>
      */
     inline SSHPublicKeyMetadata& WithStatus(StatusType&& value) { SetStatus(std::move(value)); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ServerCertificate.h b/aws-cpp-sdk-iam/include/aws/iam/model/ServerCertificate.h
index 843d608b126..5d8f5e9f022 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ServerCertificate.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ServerCertificate.h
@@ -36,7 +36,7 @@ namespace Model
 
   /**
    * <p>Contains information about a server certificate.</p> <p> This data type is
-   * used as a response element in the <a>GetServerCertificate</a> action.
+   * used as a response element in the <a>GetServerCertificate</a> operation.
    * </p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ServerCertificate">AWS
    * API Reference</a></p>
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ServerCertificateMetadata.h b/aws-cpp-sdk-iam/include/aws/iam/model/ServerCertificateMetadata.h
index 576f96d1165..333e81a161f 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ServerCertificateMetadata.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ServerCertificateMetadata.h
@@ -38,7 +38,7 @@ namespace Model
    * <p>Contains information about a server certificate without its certificate body,
    * certificate chain, and private key.</p> <p> This data type is used as a response
    * element in the <a>UploadServerCertificate</a> and <a>ListServerCertificates</a>
-   * actions. </p><p><h3>See Also:</h3>   <a
+   * operations. </p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ServerCertificateMetadata">AWS
    * API Reference</a></p>
    */
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ServiceSpecificCredential.h b/aws-cpp-sdk-iam/include/aws/iam/model/ServiceSpecificCredential.h
index f6f31a9e542..46ee029b7ba 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ServiceSpecificCredential.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ServiceSpecificCredential.h
@@ -36,7 +36,7 @@ namespace Model
 {
 
   /**
-   * <p>Contains the details of a service specific credential.</p><p><h3>See
+   * <p>Contains the details of a service-specific credential.</p><p><h3>See
    * Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/ServiceSpecificCredential">AWS
    * API Reference</a></p>
@@ -285,32 +285,32 @@ namespace Model
 
 
     /**
-     * <p>The status of the service-specific credential. <code>Active</code> means the
-     * key is valid for API calls, while <code>Inactive</code> means it is not.</p>
+     * <p>The status of the service-specific credential. <code>Active</code> means that
+     * the key is valid for API calls, while <code>Inactive</code> means it is not.</p>
      */
     inline const StatusType& GetStatus() const{ return m_status; }
 
     /**
-     * <p>The status of the service-specific credential. <code>Active</code> means the
-     * key is valid for API calls, while <code>Inactive</code> means it is not.</p>
+     * <p>The status of the service-specific credential. <code>Active</code> means that
+     * the key is valid for API calls, while <code>Inactive</code> means it is not.</p>
      */
     inline void SetStatus(const StatusType& value) { m_statusHasBeenSet = true; m_status = value; }
 
     /**
-     * <p>The status of the service-specific credential. <code>Active</code> means the
-     * key is valid for API calls, while <code>Inactive</code> means it is not.</p>
+     * <p>The status of the service-specific credential. <code>Active</code> means that
+     * the key is valid for API calls, while <code>Inactive</code> means it is not.</p>
      */
     inline void SetStatus(StatusType&& value) { m_statusHasBeenSet = true; m_status = std::move(value); }
 
     /**
-     * <p>The status of the service-specific credential. <code>Active</code> means the
-     * key is valid for API calls, while <code>Inactive</code> means it is not.</p>
+     * <p>The status of the service-specific credential. <code>Active</code> means that
+     * the key is valid for API calls, while <code>Inactive</code> means it is not.</p>
      */
     inline ServiceSpecificCredential& WithStatus(const StatusType& value) { SetStatus(value); return *this;}
 
     /**
-     * <p>The status of the service-specific credential. <code>Active</code> means the
-     * key is valid for API calls, while <code>Inactive</code> means it is not.</p>
+     * <p>The status of the service-specific credential. <code>Active</code> means that
+     * the key is valid for API calls, while <code>Inactive</code> means it is not.</p>
      */
     inline ServiceSpecificCredential& WithStatus(StatusType&& value) { SetStatus(std::move(value)); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/ServiceSpecificCredentialMetadata.h b/aws-cpp-sdk-iam/include/aws/iam/model/ServiceSpecificCredentialMetadata.h
index 1fd021fa97f..fbd5972c190 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/ServiceSpecificCredentialMetadata.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/ServiceSpecificCredentialMetadata.h
@@ -89,32 +89,32 @@ namespace Model
 
 
     /**
-     * <p>The status of the service-specific credential. <code>Active</code> means the
-     * key is valid for API calls, while <code>Inactive</code> means it is not.</p>
+     * <p>The status of the service-specific credential. <code>Active</code> means that
+     * the key is valid for API calls, while <code>Inactive</code> means it is not.</p>
      */
     inline const StatusType& GetStatus() const{ return m_status; }
 
     /**
-     * <p>The status of the service-specific credential. <code>Active</code> means the
-     * key is valid for API calls, while <code>Inactive</code> means it is not.</p>
+     * <p>The status of the service-specific credential. <code>Active</code> means that
+     * the key is valid for API calls, while <code>Inactive</code> means it is not.</p>
      */
     inline void SetStatus(const StatusType& value) { m_statusHasBeenSet = true; m_status = value; }
 
     /**
-     * <p>The status of the service-specific credential. <code>Active</code> means the
-     * key is valid for API calls, while <code>Inactive</code> means it is not.</p>
+     * <p>The status of the service-specific credential. <code>Active</code> means that
+     * the key is valid for API calls, while <code>Inactive</code> means it is not.</p>
      */
     inline void SetStatus(StatusType&& value) { m_statusHasBeenSet = true; m_status = std::move(value); }
 
     /**
-     * <p>The status of the service-specific credential. <code>Active</code> means the
-     * key is valid for API calls, while <code>Inactive</code> means it is not.</p>
+     * <p>The status of the service-specific credential. <code>Active</code> means that
+     * the key is valid for API calls, while <code>Inactive</code> means it is not.</p>
      */
     inline ServiceSpecificCredentialMetadata& WithStatus(const StatusType& value) { SetStatus(value); return *this;}
 
     /**
-     * <p>The status of the service-specific credential. <code>Active</code> means the
-     * key is valid for API calls, while <code>Inactive</code> means it is not.</p>
+     * <p>The status of the service-specific credential. <code>Active</code> means that
+     * the key is valid for API calls, while <code>Inactive</code> means it is not.</p>
      */
     inline ServiceSpecificCredentialMetadata& WithStatus(StatusType&& value) { SetStatus(std::move(value)); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/SigningCertificate.h b/aws-cpp-sdk-iam/include/aws/iam/model/SigningCertificate.h
index 0ffb1dea696..4c446ed4abd 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/SigningCertificate.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/SigningCertificate.h
@@ -38,7 +38,7 @@ namespace Model
   /**
    * <p>Contains information about an X.509 signing certificate.</p> <p>This data
    * type is used as a response element in the <a>UploadSigningCertificate</a> and
-   * <a>ListSigningCertificates</a> actions. </p><p><h3>See Also:</h3>   <a
+   * <a>ListSigningCertificates</a> operations. </p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/SigningCertificate">AWS
    * API Reference</a></p>
    */
@@ -162,32 +162,32 @@ namespace Model
 
 
     /**
-     * <p>The status of the signing certificate. <code>Active</code> means the key is
-     * valid for API calls, while <code>Inactive</code> means it is not.</p>
+     * <p>The status of the signing certificate. <code>Active</code> means that the key
+     * is valid for API calls, while <code>Inactive</code> means it is not.</p>
      */
     inline const StatusType& GetStatus() const{ return m_status; }
 
     /**
-     * <p>The status of the signing certificate. <code>Active</code> means the key is
-     * valid for API calls, while <code>Inactive</code> means it is not.</p>
+     * <p>The status of the signing certificate. <code>Active</code> means that the key
+     * is valid for API calls, while <code>Inactive</code> means it is not.</p>
      */
     inline void SetStatus(const StatusType& value) { m_statusHasBeenSet = true; m_status = value; }
 
     /**
-     * <p>The status of the signing certificate. <code>Active</code> means the key is
-     * valid for API calls, while <code>Inactive</code> means it is not.</p>
+     * <p>The status of the signing certificate. <code>Active</code> means that the key
+     * is valid for API calls, while <code>Inactive</code> means it is not.</p>
      */
     inline void SetStatus(StatusType&& value) { m_statusHasBeenSet = true; m_status = std::move(value); }
 
     /**
-     * <p>The status of the signing certificate. <code>Active</code> means the key is
-     * valid for API calls, while <code>Inactive</code> means it is not.</p>
+     * <p>The status of the signing certificate. <code>Active</code> means that the key
+     * is valid for API calls, while <code>Inactive</code> means it is not.</p>
      */
     inline SigningCertificate& WithStatus(const StatusType& value) { SetStatus(value); return *this;}
 
     /**
-     * <p>The status of the signing certificate. <code>Active</code> means the key is
-     * valid for API calls, while <code>Inactive</code> means it is not.</p>
+     * <p>The status of the signing certificate. <code>Active</code> means that the key
+     * is valid for API calls, while <code>Inactive</code> means it is not.</p>
      */
     inline SigningCertificate& WithStatus(StatusType&& value) { SetStatus(std::move(value)); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/SimulateCustomPolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/SimulateCustomPolicyRequest.h
index 2da2f50da69..cc299b3ccb3 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/SimulateCustomPolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/SimulateCustomPolicyRequest.h
@@ -58,13 +58,15 @@ namespace Model
      * href="http://docs.aws.amazon.com/IAM/latest/APIReference/API_GetFederationToken.html">GetFederationToken</a>
      * or one of the <a
      * href="http://docs.aws.amazon.com/IAM/latest/APIReference/API_AssumeRole.html">AssumeRole</a>
-     * APIs to restrict what a user can do while using the temporary credentials.</p>
-     * <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a> used to
-     * validate this parameter is a string of characters consisting of any printable
-     * ASCII character ranging from the space character (\u0020) through end of the
-     * ASCII character range as well as the printable characters in the Basic Latin and
-     * Latin-1 Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * API operations. In other words, do not use policies designed to restrict what a
+     * user can do while using the temporary credentials.</p> <p>The <a
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline const Aws::Vector<Aws::String>& GetPolicyInputList() const{ return m_policyInputList; }
 
@@ -78,13 +80,15 @@ namespace Model
      * href="http://docs.aws.amazon.com/IAM/latest/APIReference/API_GetFederationToken.html">GetFederationToken</a>
      * or one of the <a
      * href="http://docs.aws.amazon.com/IAM/latest/APIReference/API_AssumeRole.html">AssumeRole</a>
-     * APIs to restrict what a user can do while using the temporary credentials.</p>
-     * <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a> used to
-     * validate this parameter is a string of characters consisting of any printable
-     * ASCII character ranging from the space character (\u0020) through end of the
-     * ASCII character range as well as the printable characters in the Basic Latin and
-     * Latin-1 Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * API operations. In other words, do not use policies designed to restrict what a
+     * user can do while using the temporary credentials.</p> <p>The <a
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyInputList(const Aws::Vector<Aws::String>& value) { m_policyInputListHasBeenSet = true; m_policyInputList = value; }
 
@@ -98,13 +102,15 @@ namespace Model
      * href="http://docs.aws.amazon.com/IAM/latest/APIReference/API_GetFederationToken.html">GetFederationToken</a>
      * or one of the <a
      * href="http://docs.aws.amazon.com/IAM/latest/APIReference/API_AssumeRole.html">AssumeRole</a>
-     * APIs to restrict what a user can do while using the temporary credentials.</p>
-     * <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a> used to
-     * validate this parameter is a string of characters consisting of any printable
-     * ASCII character ranging from the space character (\u0020) through end of the
-     * ASCII character range as well as the printable characters in the Basic Latin and
-     * Latin-1 Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * API operations. In other words, do not use policies designed to restrict what a
+     * user can do while using the temporary credentials.</p> <p>The <a
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyInputList(Aws::Vector<Aws::String>&& value) { m_policyInputListHasBeenSet = true; m_policyInputList = std::move(value); }
 
@@ -118,13 +124,15 @@ namespace Model
      * href="http://docs.aws.amazon.com/IAM/latest/APIReference/API_GetFederationToken.html">GetFederationToken</a>
      * or one of the <a
      * href="http://docs.aws.amazon.com/IAM/latest/APIReference/API_AssumeRole.html">AssumeRole</a>
-     * APIs to restrict what a user can do while using the temporary credentials.</p>
-     * <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a> used to
-     * validate this parameter is a string of characters consisting of any printable
-     * ASCII character ranging from the space character (\u0020) through end of the
-     * ASCII character range as well as the printable characters in the Basic Latin and
-     * Latin-1 Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * API operations. In other words, do not use policies designed to restrict what a
+     * user can do while using the temporary credentials.</p> <p>The <a
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline SimulateCustomPolicyRequest& WithPolicyInputList(const Aws::Vector<Aws::String>& value) { SetPolicyInputList(value); return *this;}
 
@@ -138,13 +146,15 @@ namespace Model
      * href="http://docs.aws.amazon.com/IAM/latest/APIReference/API_GetFederationToken.html">GetFederationToken</a>
      * or one of the <a
      * href="http://docs.aws.amazon.com/IAM/latest/APIReference/API_AssumeRole.html">AssumeRole</a>
-     * APIs to restrict what a user can do while using the temporary credentials.</p>
-     * <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a> used to
-     * validate this parameter is a string of characters consisting of any printable
-     * ASCII character ranging from the space character (\u0020) through end of the
-     * ASCII character range as well as the printable characters in the Basic Latin and
-     * Latin-1 Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * API operations. In other words, do not use policies designed to restrict what a
+     * user can do while using the temporary credentials.</p> <p>The <a
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline SimulateCustomPolicyRequest& WithPolicyInputList(Aws::Vector<Aws::String>&& value) { SetPolicyInputList(std::move(value)); return *this;}
 
@@ -158,13 +168,15 @@ namespace Model
      * href="http://docs.aws.amazon.com/IAM/latest/APIReference/API_GetFederationToken.html">GetFederationToken</a>
      * or one of the <a
      * href="http://docs.aws.amazon.com/IAM/latest/APIReference/API_AssumeRole.html">AssumeRole</a>
-     * APIs to restrict what a user can do while using the temporary credentials.</p>
-     * <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a> used to
-     * validate this parameter is a string of characters consisting of any printable
-     * ASCII character ranging from the space character (\u0020) through end of the
-     * ASCII character range as well as the printable characters in the Basic Latin and
-     * Latin-1 Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * API operations. In other words, do not use policies designed to restrict what a
+     * user can do while using the temporary credentials.</p> <p>The <a
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline SimulateCustomPolicyRequest& AddPolicyInputList(const Aws::String& value) { m_policyInputListHasBeenSet = true; m_policyInputList.push_back(value); return *this; }
 
@@ -178,13 +190,15 @@ namespace Model
      * href="http://docs.aws.amazon.com/IAM/latest/APIReference/API_GetFederationToken.html">GetFederationToken</a>
      * or one of the <a
      * href="http://docs.aws.amazon.com/IAM/latest/APIReference/API_AssumeRole.html">AssumeRole</a>
-     * APIs to restrict what a user can do while using the temporary credentials.</p>
-     * <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a> used to
-     * validate this parameter is a string of characters consisting of any printable
-     * ASCII character ranging from the space character (\u0020) through end of the
-     * ASCII character range as well as the printable characters in the Basic Latin and
-     * Latin-1 Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * API operations. In other words, do not use policies designed to restrict what a
+     * user can do while using the temporary credentials.</p> <p>The <a
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline SimulateCustomPolicyRequest& AddPolicyInputList(Aws::String&& value) { m_policyInputListHasBeenSet = true; m_policyInputList.push_back(std::move(value)); return *this; }
 
@@ -198,70 +212,72 @@ namespace Model
      * href="http://docs.aws.amazon.com/IAM/latest/APIReference/API_GetFederationToken.html">GetFederationToken</a>
      * or one of the <a
      * href="http://docs.aws.amazon.com/IAM/latest/APIReference/API_AssumeRole.html">AssumeRole</a>
-     * APIs to restrict what a user can do while using the temporary credentials.</p>
-     * <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a> used to
-     * validate this parameter is a string of characters consisting of any printable
-     * ASCII character ranging from the space character (\u0020) through end of the
-     * ASCII character range as well as the printable characters in the Basic Latin and
-     * Latin-1 Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * API operations. In other words, do not use policies designed to restrict what a
+     * user can do while using the temporary credentials.</p> <p>The <a
+     * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline SimulateCustomPolicyRequest& AddPolicyInputList(const char* value) { m_policyInputListHasBeenSet = true; m_policyInputList.push_back(value); return *this; }
 
 
     /**
-     * <p>A list of names of API actions to evaluate in the simulation. Each action is
-     * evaluated against each resource. Each action must include the service
-     * identifier, such as <code>iam:CreateUser</code>.</p>
+     * <p>A list of names of API operations to evaluate in the simulation. Each
+     * operation is evaluated against each resource. Each operation must include the
+     * service identifier, such as <code>iam:CreateUser</code>.</p>
      */
     inline const Aws::Vector<Aws::String>& GetActionNames() const{ return m_actionNames; }
 
     /**
-     * <p>A list of names of API actions to evaluate in the simulation. Each action is
-     * evaluated against each resource. Each action must include the service
-     * identifier, such as <code>iam:CreateUser</code>.</p>
+     * <p>A list of names of API operations to evaluate in the simulation. Each
+     * operation is evaluated against each resource. Each operation must include the
+     * service identifier, such as <code>iam:CreateUser</code>.</p>
      */
     inline void SetActionNames(const Aws::Vector<Aws::String>& value) { m_actionNamesHasBeenSet = true; m_actionNames = value; }
 
     /**
-     * <p>A list of names of API actions to evaluate in the simulation. Each action is
-     * evaluated against each resource. Each action must include the service
-     * identifier, such as <code>iam:CreateUser</code>.</p>
+     * <p>A list of names of API operations to evaluate in the simulation. Each
+     * operation is evaluated against each resource. Each operation must include the
+     * service identifier, such as <code>iam:CreateUser</code>.</p>
      */
     inline void SetActionNames(Aws::Vector<Aws::String>&& value) { m_actionNamesHasBeenSet = true; m_actionNames = std::move(value); }
 
     /**
-     * <p>A list of names of API actions to evaluate in the simulation. Each action is
-     * evaluated against each resource. Each action must include the service
-     * identifier, such as <code>iam:CreateUser</code>.</p>
+     * <p>A list of names of API operations to evaluate in the simulation. Each
+     * operation is evaluated against each resource. Each operation must include the
+     * service identifier, such as <code>iam:CreateUser</code>.</p>
      */
     inline SimulateCustomPolicyRequest& WithActionNames(const Aws::Vector<Aws::String>& value) { SetActionNames(value); return *this;}
 
     /**
-     * <p>A list of names of API actions to evaluate in the simulation. Each action is
-     * evaluated against each resource. Each action must include the service
-     * identifier, such as <code>iam:CreateUser</code>.</p>
+     * <p>A list of names of API operations to evaluate in the simulation. Each
+     * operation is evaluated against each resource. Each operation must include the
+     * service identifier, such as <code>iam:CreateUser</code>.</p>
      */
     inline SimulateCustomPolicyRequest& WithActionNames(Aws::Vector<Aws::String>&& value) { SetActionNames(std::move(value)); return *this;}
 
     /**
-     * <p>A list of names of API actions to evaluate in the simulation. Each action is
-     * evaluated against each resource. Each action must include the service
-     * identifier, such as <code>iam:CreateUser</code>.</p>
+     * <p>A list of names of API operations to evaluate in the simulation. Each
+     * operation is evaluated against each resource. Each operation must include the
+     * service identifier, such as <code>iam:CreateUser</code>.</p>
      */
     inline SimulateCustomPolicyRequest& AddActionNames(const Aws::String& value) { m_actionNamesHasBeenSet = true; m_actionNames.push_back(value); return *this; }
 
     /**
-     * <p>A list of names of API actions to evaluate in the simulation. Each action is
-     * evaluated against each resource. Each action must include the service
-     * identifier, such as <code>iam:CreateUser</code>.</p>
+     * <p>A list of names of API operations to evaluate in the simulation. Each
+     * operation is evaluated against each resource. Each operation must include the
+     * service identifier, such as <code>iam:CreateUser</code>.</p>
      */
     inline SimulateCustomPolicyRequest& AddActionNames(Aws::String&& value) { m_actionNamesHasBeenSet = true; m_actionNames.push_back(std::move(value)); return *this; }
 
     /**
-     * <p>A list of names of API actions to evaluate in the simulation. Each action is
-     * evaluated against each resource. Each action must include the service
-     * identifier, such as <code>iam:CreateUser</code>.</p>
+     * <p>A list of names of API operations to evaluate in the simulation. Each
+     * operation is evaluated against each resource. Each operation must include the
+     * service identifier, such as <code>iam:CreateUser</code>.</p>
      */
     inline SimulateCustomPolicyRequest& AddActionNames(const char* value) { m_actionNamesHasBeenSet = true; m_actionNames.push_back(value); return *this; }
 
@@ -416,11 +432,12 @@ namespace Model
      * Each resource in the simulation is treated as if it had this policy attached.
      * You can include only one resource-based policy in a simulation.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline const Aws::String& GetResourcePolicy() const{ return m_resourcePolicy; }
 
@@ -429,11 +446,12 @@ namespace Model
      * Each resource in the simulation is treated as if it had this policy attached.
      * You can include only one resource-based policy in a simulation.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetResourcePolicy(const Aws::String& value) { m_resourcePolicyHasBeenSet = true; m_resourcePolicy = value; }
 
@@ -442,11 +460,12 @@ namespace Model
      * Each resource in the simulation is treated as if it had this policy attached.
      * You can include only one resource-based policy in a simulation.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetResourcePolicy(Aws::String&& value) { m_resourcePolicyHasBeenSet = true; m_resourcePolicy = std::move(value); }
 
@@ -455,11 +474,12 @@ namespace Model
      * Each resource in the simulation is treated as if it had this policy attached.
      * You can include only one resource-based policy in a simulation.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetResourcePolicy(const char* value) { m_resourcePolicyHasBeenSet = true; m_resourcePolicy.assign(value); }
 
@@ -468,11 +488,12 @@ namespace Model
      * Each resource in the simulation is treated as if it had this policy attached.
      * You can include only one resource-based policy in a simulation.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline SimulateCustomPolicyRequest& WithResourcePolicy(const Aws::String& value) { SetResourcePolicy(value); return *this;}
 
@@ -481,11 +502,12 @@ namespace Model
      * Each resource in the simulation is treated as if it had this policy attached.
      * You can include only one resource-based policy in a simulation.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline SimulateCustomPolicyRequest& WithResourcePolicy(Aws::String&& value) { SetResourcePolicy(std::move(value)); return *this;}
 
@@ -494,11 +516,12 @@ namespace Model
      * Each resource in the simulation is treated as if it had this policy attached.
      * You can include only one resource-based policy in a simulation.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline SimulateCustomPolicyRequest& WithResourcePolicy(const char* value) { SetResourcePolicy(value); return *this;}
 
@@ -604,7 +627,7 @@ namespace Model
 
     /**
      * <p>The ARN of the IAM user that you want to use as the simulated caller of the
-     * APIs. <code>CallerArn</code> is required if you include a
+     * API operations. <code>CallerArn</code> is required if you include a
      * <code>ResourcePolicy</code> so that the policy's <code>Principal</code> element
      * has a value to use in evaluating the policy.</p> <p>You can specify only the ARN
      * of an IAM user. You cannot specify the ARN of an assumed role, federated user,
@@ -614,7 +637,7 @@ namespace Model
 
     /**
      * <p>The ARN of the IAM user that you want to use as the simulated caller of the
-     * APIs. <code>CallerArn</code> is required if you include a
+     * API operations. <code>CallerArn</code> is required if you include a
      * <code>ResourcePolicy</code> so that the policy's <code>Principal</code> element
      * has a value to use in evaluating the policy.</p> <p>You can specify only the ARN
      * of an IAM user. You cannot specify the ARN of an assumed role, federated user,
@@ -624,7 +647,7 @@ namespace Model
 
     /**
      * <p>The ARN of the IAM user that you want to use as the simulated caller of the
-     * APIs. <code>CallerArn</code> is required if you include a
+     * API operations. <code>CallerArn</code> is required if you include a
      * <code>ResourcePolicy</code> so that the policy's <code>Principal</code> element
      * has a value to use in evaluating the policy.</p> <p>You can specify only the ARN
      * of an IAM user. You cannot specify the ARN of an assumed role, federated user,
@@ -634,7 +657,7 @@ namespace Model
 
     /**
      * <p>The ARN of the IAM user that you want to use as the simulated caller of the
-     * APIs. <code>CallerArn</code> is required if you include a
+     * API operations. <code>CallerArn</code> is required if you include a
      * <code>ResourcePolicy</code> so that the policy's <code>Principal</code> element
      * has a value to use in evaluating the policy.</p> <p>You can specify only the ARN
      * of an IAM user. You cannot specify the ARN of an assumed role, federated user,
@@ -644,7 +667,7 @@ namespace Model
 
     /**
      * <p>The ARN of the IAM user that you want to use as the simulated caller of the
-     * APIs. <code>CallerArn</code> is required if you include a
+     * API operations. <code>CallerArn</code> is required if you include a
      * <code>ResourcePolicy</code> so that the policy's <code>Principal</code> element
      * has a value to use in evaluating the policy.</p> <p>You can specify only the ARN
      * of an IAM user. You cannot specify the ARN of an assumed role, federated user,
@@ -654,7 +677,7 @@ namespace Model
 
     /**
      * <p>The ARN of the IAM user that you want to use as the simulated caller of the
-     * APIs. <code>CallerArn</code> is required if you include a
+     * API operations. <code>CallerArn</code> is required if you include a
      * <code>ResourcePolicy</code> so that the policy's <code>Principal</code> element
      * has a value to use in evaluating the policy.</p> <p>You can specify only the ARN
      * of an IAM user. You cannot specify the ARN of an assumed role, federated user,
@@ -664,7 +687,7 @@ namespace Model
 
     /**
      * <p>The ARN of the IAM user that you want to use as the simulated caller of the
-     * APIs. <code>CallerArn</code> is required if you include a
+     * API operations. <code>CallerArn</code> is required if you include a
      * <code>ResourcePolicy</code> so that the policy's <code>Principal</code> element
      * has a value to use in evaluating the policy.</p> <p>You can specify only the ARN
      * of an IAM user. You cannot specify the ARN of an assumed role, federated user,
@@ -724,8 +747,8 @@ namespace Model
 
 
     /**
-     * <p>Specifies the type of simulation to run. Different APIs that support
-     * resource-based policies require different combinations of resources. By
+     * <p>Specifies the type of simulation to run. Different API operations that
+     * support resource-based policies require different combinations of resources. By
      * specifying the type of simulation to run, you enable the policy simulator to
      * enforce the presence of the required resources to ensure reliable simulation
      * results. If your simulation does not match one of the following scenarios, then
@@ -738,7 +761,7 @@ namespace Model
      * subnet, then you must specify the subnet resource. For more information on the
      * EC2 scenario options, see <a
      * href="http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html">Supported
-     * Platforms</a> in the <i>AWS EC2 User Guide</i>.</p> <ul> <li> <p>
+     * Platforms</a> in the <i>Amazon EC2 User Guide</i>.</p> <ul> <li> <p>
      * <b>EC2-Classic-InstanceStore</b> </p> <p>instance, image, security-group</p>
      * </li> <li> <p> <b>EC2-Classic-EBS</b> </p> <p>instance, image, security-group,
      * volume</p> </li> <li> <p> <b>EC2-VPC-InstanceStore</b> </p> <p>instance, image,
@@ -752,8 +775,8 @@ namespace Model
     inline const Aws::String& GetResourceHandlingOption() const{ return m_resourceHandlingOption; }
 
     /**
-     * <p>Specifies the type of simulation to run. Different APIs that support
-     * resource-based policies require different combinations of resources. By
+     * <p>Specifies the type of simulation to run. Different API operations that
+     * support resource-based policies require different combinations of resources. By
      * specifying the type of simulation to run, you enable the policy simulator to
      * enforce the presence of the required resources to ensure reliable simulation
      * results. If your simulation does not match one of the following scenarios, then
@@ -766,7 +789,7 @@ namespace Model
      * subnet, then you must specify the subnet resource. For more information on the
      * EC2 scenario options, see <a
      * href="http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html">Supported
-     * Platforms</a> in the <i>AWS EC2 User Guide</i>.</p> <ul> <li> <p>
+     * Platforms</a> in the <i>Amazon EC2 User Guide</i>.</p> <ul> <li> <p>
      * <b>EC2-Classic-InstanceStore</b> </p> <p>instance, image, security-group</p>
      * </li> <li> <p> <b>EC2-Classic-EBS</b> </p> <p>instance, image, security-group,
      * volume</p> </li> <li> <p> <b>EC2-VPC-InstanceStore</b> </p> <p>instance, image,
@@ -780,8 +803,8 @@ namespace Model
     inline void SetResourceHandlingOption(const Aws::String& value) { m_resourceHandlingOptionHasBeenSet = true; m_resourceHandlingOption = value; }
 
     /**
-     * <p>Specifies the type of simulation to run. Different APIs that support
-     * resource-based policies require different combinations of resources. By
+     * <p>Specifies the type of simulation to run. Different API operations that
+     * support resource-based policies require different combinations of resources. By
      * specifying the type of simulation to run, you enable the policy simulator to
      * enforce the presence of the required resources to ensure reliable simulation
      * results. If your simulation does not match one of the following scenarios, then
@@ -794,7 +817,7 @@ namespace Model
      * subnet, then you must specify the subnet resource. For more information on the
      * EC2 scenario options, see <a
      * href="http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html">Supported
-     * Platforms</a> in the <i>AWS EC2 User Guide</i>.</p> <ul> <li> <p>
+     * Platforms</a> in the <i>Amazon EC2 User Guide</i>.</p> <ul> <li> <p>
      * <b>EC2-Classic-InstanceStore</b> </p> <p>instance, image, security-group</p>
      * </li> <li> <p> <b>EC2-Classic-EBS</b> </p> <p>instance, image, security-group,
      * volume</p> </li> <li> <p> <b>EC2-VPC-InstanceStore</b> </p> <p>instance, image,
@@ -808,8 +831,8 @@ namespace Model
     inline void SetResourceHandlingOption(Aws::String&& value) { m_resourceHandlingOptionHasBeenSet = true; m_resourceHandlingOption = std::move(value); }
 
     /**
-     * <p>Specifies the type of simulation to run. Different APIs that support
-     * resource-based policies require different combinations of resources. By
+     * <p>Specifies the type of simulation to run. Different API operations that
+     * support resource-based policies require different combinations of resources. By
      * specifying the type of simulation to run, you enable the policy simulator to
      * enforce the presence of the required resources to ensure reliable simulation
      * results. If your simulation does not match one of the following scenarios, then
@@ -822,7 +845,7 @@ namespace Model
      * subnet, then you must specify the subnet resource. For more information on the
      * EC2 scenario options, see <a
      * href="http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html">Supported
-     * Platforms</a> in the <i>AWS EC2 User Guide</i>.</p> <ul> <li> <p>
+     * Platforms</a> in the <i>Amazon EC2 User Guide</i>.</p> <ul> <li> <p>
      * <b>EC2-Classic-InstanceStore</b> </p> <p>instance, image, security-group</p>
      * </li> <li> <p> <b>EC2-Classic-EBS</b> </p> <p>instance, image, security-group,
      * volume</p> </li> <li> <p> <b>EC2-VPC-InstanceStore</b> </p> <p>instance, image,
@@ -836,8 +859,8 @@ namespace Model
     inline void SetResourceHandlingOption(const char* value) { m_resourceHandlingOptionHasBeenSet = true; m_resourceHandlingOption.assign(value); }
 
     /**
-     * <p>Specifies the type of simulation to run. Different APIs that support
-     * resource-based policies require different combinations of resources. By
+     * <p>Specifies the type of simulation to run. Different API operations that
+     * support resource-based policies require different combinations of resources. By
      * specifying the type of simulation to run, you enable the policy simulator to
      * enforce the presence of the required resources to ensure reliable simulation
      * results. If your simulation does not match one of the following scenarios, then
@@ -850,7 +873,7 @@ namespace Model
      * subnet, then you must specify the subnet resource. For more information on the
      * EC2 scenario options, see <a
      * href="http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html">Supported
-     * Platforms</a> in the <i>AWS EC2 User Guide</i>.</p> <ul> <li> <p>
+     * Platforms</a> in the <i>Amazon EC2 User Guide</i>.</p> <ul> <li> <p>
      * <b>EC2-Classic-InstanceStore</b> </p> <p>instance, image, security-group</p>
      * </li> <li> <p> <b>EC2-Classic-EBS</b> </p> <p>instance, image, security-group,
      * volume</p> </li> <li> <p> <b>EC2-VPC-InstanceStore</b> </p> <p>instance, image,
@@ -864,8 +887,8 @@ namespace Model
     inline SimulateCustomPolicyRequest& WithResourceHandlingOption(const Aws::String& value) { SetResourceHandlingOption(value); return *this;}
 
     /**
-     * <p>Specifies the type of simulation to run. Different APIs that support
-     * resource-based policies require different combinations of resources. By
+     * <p>Specifies the type of simulation to run. Different API operations that
+     * support resource-based policies require different combinations of resources. By
      * specifying the type of simulation to run, you enable the policy simulator to
      * enforce the presence of the required resources to ensure reliable simulation
      * results. If your simulation does not match one of the following scenarios, then
@@ -878,7 +901,7 @@ namespace Model
      * subnet, then you must specify the subnet resource. For more information on the
      * EC2 scenario options, see <a
      * href="http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html">Supported
-     * Platforms</a> in the <i>AWS EC2 User Guide</i>.</p> <ul> <li> <p>
+     * Platforms</a> in the <i>Amazon EC2 User Guide</i>.</p> <ul> <li> <p>
      * <b>EC2-Classic-InstanceStore</b> </p> <p>instance, image, security-group</p>
      * </li> <li> <p> <b>EC2-Classic-EBS</b> </p> <p>instance, image, security-group,
      * volume</p> </li> <li> <p> <b>EC2-VPC-InstanceStore</b> </p> <p>instance, image,
@@ -892,8 +915,8 @@ namespace Model
     inline SimulateCustomPolicyRequest& WithResourceHandlingOption(Aws::String&& value) { SetResourceHandlingOption(std::move(value)); return *this;}
 
     /**
-     * <p>Specifies the type of simulation to run. Different APIs that support
-     * resource-based policies require different combinations of resources. By
+     * <p>Specifies the type of simulation to run. Different API operations that
+     * support resource-based policies require different combinations of resources. By
      * specifying the type of simulation to run, you enable the policy simulator to
      * enforce the presence of the required resources to ensure reliable simulation
      * results. If your simulation does not match one of the following scenarios, then
@@ -906,7 +929,7 @@ namespace Model
      * subnet, then you must specify the subnet resource. For more information on the
      * EC2 scenario options, see <a
      * href="http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html">Supported
-     * Platforms</a> in the <i>AWS EC2 User Guide</i>.</p> <ul> <li> <p>
+     * Platforms</a> in the <i>Amazon EC2 User Guide</i>.</p> <ul> <li> <p>
      * <b>EC2-Classic-InstanceStore</b> </p> <p>instance, image, security-group</p>
      * </li> <li> <p> <b>EC2-Classic-EBS</b> </p> <p>instance, image, security-group,
      * volume</p> </li> <li> <p> <b>EC2-VPC-InstanceStore</b> </p> <p>instance, image,
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/SimulatePrincipalPolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/SimulatePrincipalPolicyRequest.h
index b35eaf5f591..74a017af171 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/SimulatePrincipalPolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/SimulatePrincipalPolicyRequest.h
@@ -138,11 +138,11 @@ namespace Model
      * Each document is specified as a string containing the complete, valid JSON text
      * of an IAM policy.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a> used to validate this parameter is a string of characters consisting
-     * of any printable ASCII character ranging from the space character (\u0020)
-     * through end of the ASCII character range as well as the printable characters in
-     * the Basic Latin and Latin-1 Supplement character set (through \u00FF). It also
-     * includes the special characters tab (\u0009), line feed (\u000A), and carriage
-     * return (\u000D).</p>
+     * of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from
+     * the space character (\u0020) through the end of the ASCII character range</p>
+     * </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement
+     * character set (through \u00FF)</p> </li> <li> <p>The special characters tab
+     * (\u0009), line feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline const Aws::Vector<Aws::String>& GetPolicyInputList() const{ return m_policyInputList; }
 
@@ -151,11 +151,11 @@ namespace Model
      * Each document is specified as a string containing the complete, valid JSON text
      * of an IAM policy.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a> used to validate this parameter is a string of characters consisting
-     * of any printable ASCII character ranging from the space character (\u0020)
-     * through end of the ASCII character range as well as the printable characters in
-     * the Basic Latin and Latin-1 Supplement character set (through \u00FF). It also
-     * includes the special characters tab (\u0009), line feed (\u000A), and carriage
-     * return (\u000D).</p>
+     * of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from
+     * the space character (\u0020) through the end of the ASCII character range</p>
+     * </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement
+     * character set (through \u00FF)</p> </li> <li> <p>The special characters tab
+     * (\u0009), line feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyInputList(const Aws::Vector<Aws::String>& value) { m_policyInputListHasBeenSet = true; m_policyInputList = value; }
 
@@ -164,11 +164,11 @@ namespace Model
      * Each document is specified as a string containing the complete, valid JSON text
      * of an IAM policy.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a> used to validate this parameter is a string of characters consisting
-     * of any printable ASCII character ranging from the space character (\u0020)
-     * through end of the ASCII character range as well as the printable characters in
-     * the Basic Latin and Latin-1 Supplement character set (through \u00FF). It also
-     * includes the special characters tab (\u0009), line feed (\u000A), and carriage
-     * return (\u000D).</p>
+     * of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from
+     * the space character (\u0020) through the end of the ASCII character range</p>
+     * </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement
+     * character set (through \u00FF)</p> </li> <li> <p>The special characters tab
+     * (\u0009), line feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyInputList(Aws::Vector<Aws::String>&& value) { m_policyInputListHasBeenSet = true; m_policyInputList = std::move(value); }
 
@@ -177,11 +177,11 @@ namespace Model
      * Each document is specified as a string containing the complete, valid JSON text
      * of an IAM policy.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a> used to validate this parameter is a string of characters consisting
-     * of any printable ASCII character ranging from the space character (\u0020)
-     * through end of the ASCII character range as well as the printable characters in
-     * the Basic Latin and Latin-1 Supplement character set (through \u00FF). It also
-     * includes the special characters tab (\u0009), line feed (\u000A), and carriage
-     * return (\u000D).</p>
+     * of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from
+     * the space character (\u0020) through the end of the ASCII character range</p>
+     * </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement
+     * character set (through \u00FF)</p> </li> <li> <p>The special characters tab
+     * (\u0009), line feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline SimulatePrincipalPolicyRequest& WithPolicyInputList(const Aws::Vector<Aws::String>& value) { SetPolicyInputList(value); return *this;}
 
@@ -190,11 +190,11 @@ namespace Model
      * Each document is specified as a string containing the complete, valid JSON text
      * of an IAM policy.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a> used to validate this parameter is a string of characters consisting
-     * of any printable ASCII character ranging from the space character (\u0020)
-     * through end of the ASCII character range as well as the printable characters in
-     * the Basic Latin and Latin-1 Supplement character set (through \u00FF). It also
-     * includes the special characters tab (\u0009), line feed (\u000A), and carriage
-     * return (\u000D).</p>
+     * of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from
+     * the space character (\u0020) through the end of the ASCII character range</p>
+     * </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement
+     * character set (through \u00FF)</p> </li> <li> <p>The special characters tab
+     * (\u0009), line feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline SimulatePrincipalPolicyRequest& WithPolicyInputList(Aws::Vector<Aws::String>&& value) { SetPolicyInputList(std::move(value)); return *this;}
 
@@ -203,11 +203,11 @@ namespace Model
      * Each document is specified as a string containing the complete, valid JSON text
      * of an IAM policy.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a> used to validate this parameter is a string of characters consisting
-     * of any printable ASCII character ranging from the space character (\u0020)
-     * through end of the ASCII character range as well as the printable characters in
-     * the Basic Latin and Latin-1 Supplement character set (through \u00FF). It also
-     * includes the special characters tab (\u0009), line feed (\u000A), and carriage
-     * return (\u000D).</p>
+     * of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from
+     * the space character (\u0020) through the end of the ASCII character range</p>
+     * </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement
+     * character set (through \u00FF)</p> </li> <li> <p>The special characters tab
+     * (\u0009), line feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline SimulatePrincipalPolicyRequest& AddPolicyInputList(const Aws::String& value) { m_policyInputListHasBeenSet = true; m_policyInputList.push_back(value); return *this; }
 
@@ -216,11 +216,11 @@ namespace Model
      * Each document is specified as a string containing the complete, valid JSON text
      * of an IAM policy.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a> used to validate this parameter is a string of characters consisting
-     * of any printable ASCII character ranging from the space character (\u0020)
-     * through end of the ASCII character range as well as the printable characters in
-     * the Basic Latin and Latin-1 Supplement character set (through \u00FF). It also
-     * includes the special characters tab (\u0009), line feed (\u000A), and carriage
-     * return (\u000D).</p>
+     * of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from
+     * the space character (\u0020) through the end of the ASCII character range</p>
+     * </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement
+     * character set (through \u00FF)</p> </li> <li> <p>The special characters tab
+     * (\u0009), line feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline SimulatePrincipalPolicyRequest& AddPolicyInputList(Aws::String&& value) { m_policyInputListHasBeenSet = true; m_policyInputList.push_back(std::move(value)); return *this; }
 
@@ -229,75 +229,75 @@ namespace Model
      * Each document is specified as a string containing the complete, valid JSON text
      * of an IAM policy.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a> used to validate this parameter is a string of characters consisting
-     * of any printable ASCII character ranging from the space character (\u0020)
-     * through end of the ASCII character range as well as the printable characters in
-     * the Basic Latin and Latin-1 Supplement character set (through \u00FF). It also
-     * includes the special characters tab (\u0009), line feed (\u000A), and carriage
-     * return (\u000D).</p>
+     * of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from
+     * the space character (\u0020) through the end of the ASCII character range</p>
+     * </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement
+     * character set (through \u00FF)</p> </li> <li> <p>The special characters tab
+     * (\u0009), line feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline SimulatePrincipalPolicyRequest& AddPolicyInputList(const char* value) { m_policyInputListHasBeenSet = true; m_policyInputList.push_back(value); return *this; }
 
 
     /**
-     * <p>A list of names of API actions to evaluate in the simulation. Each action is
-     * evaluated for each resource. Each action must include the service identifier,
-     * such as <code>iam:CreateUser</code>.</p>
+     * <p>A list of names of API operations to evaluate in the simulation. Each
+     * operation is evaluated for each resource. Each operation must include the
+     * service identifier, such as <code>iam:CreateUser</code>.</p>
      */
     inline const Aws::Vector<Aws::String>& GetActionNames() const{ return m_actionNames; }
 
     /**
-     * <p>A list of names of API actions to evaluate in the simulation. Each action is
-     * evaluated for each resource. Each action must include the service identifier,
-     * such as <code>iam:CreateUser</code>.</p>
+     * <p>A list of names of API operations to evaluate in the simulation. Each
+     * operation is evaluated for each resource. Each operation must include the
+     * service identifier, such as <code>iam:CreateUser</code>.</p>
      */
     inline void SetActionNames(const Aws::Vector<Aws::String>& value) { m_actionNamesHasBeenSet = true; m_actionNames = value; }
 
     /**
-     * <p>A list of names of API actions to evaluate in the simulation. Each action is
-     * evaluated for each resource. Each action must include the service identifier,
-     * such as <code>iam:CreateUser</code>.</p>
+     * <p>A list of names of API operations to evaluate in the simulation. Each
+     * operation is evaluated for each resource. Each operation must include the
+     * service identifier, such as <code>iam:CreateUser</code>.</p>
      */
     inline void SetActionNames(Aws::Vector<Aws::String>&& value) { m_actionNamesHasBeenSet = true; m_actionNames = std::move(value); }
 
     /**
-     * <p>A list of names of API actions to evaluate in the simulation. Each action is
-     * evaluated for each resource. Each action must include the service identifier,
-     * such as <code>iam:CreateUser</code>.</p>
+     * <p>A list of names of API operations to evaluate in the simulation. Each
+     * operation is evaluated for each resource. Each operation must include the
+     * service identifier, such as <code>iam:CreateUser</code>.</p>
      */
     inline SimulatePrincipalPolicyRequest& WithActionNames(const Aws::Vector<Aws::String>& value) { SetActionNames(value); return *this;}
 
     /**
-     * <p>A list of names of API actions to evaluate in the simulation. Each action is
-     * evaluated for each resource. Each action must include the service identifier,
-     * such as <code>iam:CreateUser</code>.</p>
+     * <p>A list of names of API operations to evaluate in the simulation. Each
+     * operation is evaluated for each resource. Each operation must include the
+     * service identifier, such as <code>iam:CreateUser</code>.</p>
      */
     inline SimulatePrincipalPolicyRequest& WithActionNames(Aws::Vector<Aws::String>&& value) { SetActionNames(std::move(value)); return *this;}
 
     /**
-     * <p>A list of names of API actions to evaluate in the simulation. Each action is
-     * evaluated for each resource. Each action must include the service identifier,
-     * such as <code>iam:CreateUser</code>.</p>
+     * <p>A list of names of API operations to evaluate in the simulation. Each
+     * operation is evaluated for each resource. Each operation must include the
+     * service identifier, such as <code>iam:CreateUser</code>.</p>
      */
     inline SimulatePrincipalPolicyRequest& AddActionNames(const Aws::String& value) { m_actionNamesHasBeenSet = true; m_actionNames.push_back(value); return *this; }
 
     /**
-     * <p>A list of names of API actions to evaluate in the simulation. Each action is
-     * evaluated for each resource. Each action must include the service identifier,
-     * such as <code>iam:CreateUser</code>.</p>
+     * <p>A list of names of API operations to evaluate in the simulation. Each
+     * operation is evaluated for each resource. Each operation must include the
+     * service identifier, such as <code>iam:CreateUser</code>.</p>
      */
     inline SimulatePrincipalPolicyRequest& AddActionNames(Aws::String&& value) { m_actionNamesHasBeenSet = true; m_actionNames.push_back(std::move(value)); return *this; }
 
     /**
-     * <p>A list of names of API actions to evaluate in the simulation. Each action is
-     * evaluated for each resource. Each action must include the service identifier,
-     * such as <code>iam:CreateUser</code>.</p>
+     * <p>A list of names of API operations to evaluate in the simulation. Each
+     * operation is evaluated for each resource. Each operation must include the
+     * service identifier, such as <code>iam:CreateUser</code>.</p>
      */
     inline SimulatePrincipalPolicyRequest& AddActionNames(const char* value) { m_actionNamesHasBeenSet = true; m_actionNames.push_back(value); return *this; }
 
 
     /**
      * <p>A list of ARNs of AWS resources to include in the simulation. If this
-     * parameter is not provided then the value defaults to <code>*</code> (all
+     * parameter is not provided, then the value defaults to <code>*</code> (all
      * resources). Each API in the <code>ActionNames</code> parameter is evaluated for
      * each resource in this list. The simulation determines the access result (allowed
      * or denied) of each combination and reports it in the response.</p> <p>The
@@ -313,7 +313,7 @@ namespace Model
 
     /**
      * <p>A list of ARNs of AWS resources to include in the simulation. If this
-     * parameter is not provided then the value defaults to <code>*</code> (all
+     * parameter is not provided, then the value defaults to <code>*</code> (all
      * resources). Each API in the <code>ActionNames</code> parameter is evaluated for
      * each resource in this list. The simulation determines the access result (allowed
      * or denied) of each combination and reports it in the response.</p> <p>The
@@ -329,7 +329,7 @@ namespace Model
 
     /**
      * <p>A list of ARNs of AWS resources to include in the simulation. If this
-     * parameter is not provided then the value defaults to <code>*</code> (all
+     * parameter is not provided, then the value defaults to <code>*</code> (all
      * resources). Each API in the <code>ActionNames</code> parameter is evaluated for
      * each resource in this list. The simulation determines the access result (allowed
      * or denied) of each combination and reports it in the response.</p> <p>The
@@ -345,7 +345,7 @@ namespace Model
 
     /**
      * <p>A list of ARNs of AWS resources to include in the simulation. If this
-     * parameter is not provided then the value defaults to <code>*</code> (all
+     * parameter is not provided, then the value defaults to <code>*</code> (all
      * resources). Each API in the <code>ActionNames</code> parameter is evaluated for
      * each resource in this list. The simulation determines the access result (allowed
      * or denied) of each combination and reports it in the response.</p> <p>The
@@ -361,7 +361,7 @@ namespace Model
 
     /**
      * <p>A list of ARNs of AWS resources to include in the simulation. If this
-     * parameter is not provided then the value defaults to <code>*</code> (all
+     * parameter is not provided, then the value defaults to <code>*</code> (all
      * resources). Each API in the <code>ActionNames</code> parameter is evaluated for
      * each resource in this list. The simulation determines the access result (allowed
      * or denied) of each combination and reports it in the response.</p> <p>The
@@ -377,7 +377,7 @@ namespace Model
 
     /**
      * <p>A list of ARNs of AWS resources to include in the simulation. If this
-     * parameter is not provided then the value defaults to <code>*</code> (all
+     * parameter is not provided, then the value defaults to <code>*</code> (all
      * resources). Each API in the <code>ActionNames</code> parameter is evaluated for
      * each resource in this list. The simulation determines the access result (allowed
      * or denied) of each combination and reports it in the response.</p> <p>The
@@ -393,7 +393,7 @@ namespace Model
 
     /**
      * <p>A list of ARNs of AWS resources to include in the simulation. If this
-     * parameter is not provided then the value defaults to <code>*</code> (all
+     * parameter is not provided, then the value defaults to <code>*</code> (all
      * resources). Each API in the <code>ActionNames</code> parameter is evaluated for
      * each resource in this list. The simulation determines the access result (allowed
      * or denied) of each combination and reports it in the response.</p> <p>The
@@ -409,7 +409,7 @@ namespace Model
 
     /**
      * <p>A list of ARNs of AWS resources to include in the simulation. If this
-     * parameter is not provided then the value defaults to <code>*</code> (all
+     * parameter is not provided, then the value defaults to <code>*</code> (all
      * resources). Each API in the <code>ActionNames</code> parameter is evaluated for
      * each resource in this list. The simulation determines the access result (allowed
      * or denied) of each combination and reports it in the response.</p> <p>The
@@ -429,11 +429,12 @@ namespace Model
      * Each resource in the simulation is treated as if it had this policy attached.
      * You can include only one resource-based policy in a simulation.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline const Aws::String& GetResourcePolicy() const{ return m_resourcePolicy; }
 
@@ -442,11 +443,12 @@ namespace Model
      * Each resource in the simulation is treated as if it had this policy attached.
      * You can include only one resource-based policy in a simulation.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetResourcePolicy(const Aws::String& value) { m_resourcePolicyHasBeenSet = true; m_resourcePolicy = value; }
 
@@ -455,11 +457,12 @@ namespace Model
      * Each resource in the simulation is treated as if it had this policy attached.
      * You can include only one resource-based policy in a simulation.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetResourcePolicy(Aws::String&& value) { m_resourcePolicyHasBeenSet = true; m_resourcePolicy = std::move(value); }
 
@@ -468,11 +471,12 @@ namespace Model
      * Each resource in the simulation is treated as if it had this policy attached.
      * You can include only one resource-based policy in a simulation.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetResourcePolicy(const char* value) { m_resourcePolicyHasBeenSet = true; m_resourcePolicy.assign(value); }
 
@@ -481,11 +485,12 @@ namespace Model
      * Each resource in the simulation is treated as if it had this policy attached.
      * You can include only one resource-based policy in a simulation.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline SimulatePrincipalPolicyRequest& WithResourcePolicy(const Aws::String& value) { SetResourcePolicy(value); return *this;}
 
@@ -494,11 +499,12 @@ namespace Model
      * Each resource in the simulation is treated as if it had this policy attached.
      * You can include only one resource-based policy in a simulation.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline SimulatePrincipalPolicyRequest& WithResourcePolicy(Aws::String&& value) { SetResourcePolicy(std::move(value)); return *this;}
 
@@ -507,11 +513,12 @@ namespace Model
      * Each resource in the simulation is treated as if it had this policy attached.
      * You can include only one resource-based policy in a simulation.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline SimulatePrincipalPolicyRequest& WithResourcePolicy(const char* value) { SetResourcePolicy(value); return *this;}
 
@@ -617,12 +624,13 @@ namespace Model
 
     /**
      * <p>The ARN of the IAM user that you want to specify as the simulated caller of
-     * the APIs. If you do not specify a <code>CallerArn</code>, it defaults to the ARN
-     * of the user that you specify in <code>PolicySourceArn</code>, if you specified a
-     * user. If you include both a <code>PolicySourceArn</code> (for example,
-     * <code>arn:aws:iam::123456789012:user/David</code>) and a <code>CallerArn</code>
-     * (for example, <code>arn:aws:iam::123456789012:user/Bob</code>), the result is
-     * that you simulate calling the APIs as Bob, as if Bob had David's policies.</p>
+     * the API operations. If you do not specify a <code>CallerArn</code>, it defaults
+     * to the ARN of the user that you specify in <code>PolicySourceArn</code>, if you
+     * specified a user. If you include both a <code>PolicySourceArn</code> (for
+     * example, <code>arn:aws:iam::123456789012:user/David</code>) and a
+     * <code>CallerArn</code> (for example,
+     * <code>arn:aws:iam::123456789012:user/Bob</code>), the result is that you
+     * simulate calling the API operations as Bob, as if Bob had David's policies.</p>
      * <p>You can specify only the ARN of an IAM user. You cannot specify the ARN of an
      * assumed role, federated user, or a service principal.</p> <p>
      * <code>CallerArn</code> is required if you include a <code>ResourcePolicy</code>
@@ -638,12 +646,13 @@ namespace Model
 
     /**
      * <p>The ARN of the IAM user that you want to specify as the simulated caller of
-     * the APIs. If you do not specify a <code>CallerArn</code>, it defaults to the ARN
-     * of the user that you specify in <code>PolicySourceArn</code>, if you specified a
-     * user. If you include both a <code>PolicySourceArn</code> (for example,
-     * <code>arn:aws:iam::123456789012:user/David</code>) and a <code>CallerArn</code>
-     * (for example, <code>arn:aws:iam::123456789012:user/Bob</code>), the result is
-     * that you simulate calling the APIs as Bob, as if Bob had David's policies.</p>
+     * the API operations. If you do not specify a <code>CallerArn</code>, it defaults
+     * to the ARN of the user that you specify in <code>PolicySourceArn</code>, if you
+     * specified a user. If you include both a <code>PolicySourceArn</code> (for
+     * example, <code>arn:aws:iam::123456789012:user/David</code>) and a
+     * <code>CallerArn</code> (for example,
+     * <code>arn:aws:iam::123456789012:user/Bob</code>), the result is that you
+     * simulate calling the API operations as Bob, as if Bob had David's policies.</p>
      * <p>You can specify only the ARN of an IAM user. You cannot specify the ARN of an
      * assumed role, federated user, or a service principal.</p> <p>
      * <code>CallerArn</code> is required if you include a <code>ResourcePolicy</code>
@@ -659,12 +668,13 @@ namespace Model
 
     /**
      * <p>The ARN of the IAM user that you want to specify as the simulated caller of
-     * the APIs. If you do not specify a <code>CallerArn</code>, it defaults to the ARN
-     * of the user that you specify in <code>PolicySourceArn</code>, if you specified a
-     * user. If you include both a <code>PolicySourceArn</code> (for example,
-     * <code>arn:aws:iam::123456789012:user/David</code>) and a <code>CallerArn</code>
-     * (for example, <code>arn:aws:iam::123456789012:user/Bob</code>), the result is
-     * that you simulate calling the APIs as Bob, as if Bob had David's policies.</p>
+     * the API operations. If you do not specify a <code>CallerArn</code>, it defaults
+     * to the ARN of the user that you specify in <code>PolicySourceArn</code>, if you
+     * specified a user. If you include both a <code>PolicySourceArn</code> (for
+     * example, <code>arn:aws:iam::123456789012:user/David</code>) and a
+     * <code>CallerArn</code> (for example,
+     * <code>arn:aws:iam::123456789012:user/Bob</code>), the result is that you
+     * simulate calling the API operations as Bob, as if Bob had David's policies.</p>
      * <p>You can specify only the ARN of an IAM user. You cannot specify the ARN of an
      * assumed role, federated user, or a service principal.</p> <p>
      * <code>CallerArn</code> is required if you include a <code>ResourcePolicy</code>
@@ -680,12 +690,13 @@ namespace Model
 
     /**
      * <p>The ARN of the IAM user that you want to specify as the simulated caller of
-     * the APIs. If you do not specify a <code>CallerArn</code>, it defaults to the ARN
-     * of the user that you specify in <code>PolicySourceArn</code>, if you specified a
-     * user. If you include both a <code>PolicySourceArn</code> (for example,
-     * <code>arn:aws:iam::123456789012:user/David</code>) and a <code>CallerArn</code>
-     * (for example, <code>arn:aws:iam::123456789012:user/Bob</code>), the result is
-     * that you simulate calling the APIs as Bob, as if Bob had David's policies.</p>
+     * the API operations. If you do not specify a <code>CallerArn</code>, it defaults
+     * to the ARN of the user that you specify in <code>PolicySourceArn</code>, if you
+     * specified a user. If you include both a <code>PolicySourceArn</code> (for
+     * example, <code>arn:aws:iam::123456789012:user/David</code>) and a
+     * <code>CallerArn</code> (for example,
+     * <code>arn:aws:iam::123456789012:user/Bob</code>), the result is that you
+     * simulate calling the API operations as Bob, as if Bob had David's policies.</p>
      * <p>You can specify only the ARN of an IAM user. You cannot specify the ARN of an
      * assumed role, federated user, or a service principal.</p> <p>
      * <code>CallerArn</code> is required if you include a <code>ResourcePolicy</code>
@@ -701,12 +712,13 @@ namespace Model
 
     /**
      * <p>The ARN of the IAM user that you want to specify as the simulated caller of
-     * the APIs. If you do not specify a <code>CallerArn</code>, it defaults to the ARN
-     * of the user that you specify in <code>PolicySourceArn</code>, if you specified a
-     * user. If you include both a <code>PolicySourceArn</code> (for example,
-     * <code>arn:aws:iam::123456789012:user/David</code>) and a <code>CallerArn</code>
-     * (for example, <code>arn:aws:iam::123456789012:user/Bob</code>), the result is
-     * that you simulate calling the APIs as Bob, as if Bob had David's policies.</p>
+     * the API operations. If you do not specify a <code>CallerArn</code>, it defaults
+     * to the ARN of the user that you specify in <code>PolicySourceArn</code>, if you
+     * specified a user. If you include both a <code>PolicySourceArn</code> (for
+     * example, <code>arn:aws:iam::123456789012:user/David</code>) and a
+     * <code>CallerArn</code> (for example,
+     * <code>arn:aws:iam::123456789012:user/Bob</code>), the result is that you
+     * simulate calling the API operations as Bob, as if Bob had David's policies.</p>
      * <p>You can specify only the ARN of an IAM user. You cannot specify the ARN of an
      * assumed role, federated user, or a service principal.</p> <p>
      * <code>CallerArn</code> is required if you include a <code>ResourcePolicy</code>
@@ -722,12 +734,13 @@ namespace Model
 
     /**
      * <p>The ARN of the IAM user that you want to specify as the simulated caller of
-     * the APIs. If you do not specify a <code>CallerArn</code>, it defaults to the ARN
-     * of the user that you specify in <code>PolicySourceArn</code>, if you specified a
-     * user. If you include both a <code>PolicySourceArn</code> (for example,
-     * <code>arn:aws:iam::123456789012:user/David</code>) and a <code>CallerArn</code>
-     * (for example, <code>arn:aws:iam::123456789012:user/Bob</code>), the result is
-     * that you simulate calling the APIs as Bob, as if Bob had David's policies.</p>
+     * the API operations. If you do not specify a <code>CallerArn</code>, it defaults
+     * to the ARN of the user that you specify in <code>PolicySourceArn</code>, if you
+     * specified a user. If you include both a <code>PolicySourceArn</code> (for
+     * example, <code>arn:aws:iam::123456789012:user/David</code>) and a
+     * <code>CallerArn</code> (for example,
+     * <code>arn:aws:iam::123456789012:user/Bob</code>), the result is that you
+     * simulate calling the API operations as Bob, as if Bob had David's policies.</p>
      * <p>You can specify only the ARN of an IAM user. You cannot specify the ARN of an
      * assumed role, federated user, or a service principal.</p> <p>
      * <code>CallerArn</code> is required if you include a <code>ResourcePolicy</code>
@@ -743,12 +756,13 @@ namespace Model
 
     /**
      * <p>The ARN of the IAM user that you want to specify as the simulated caller of
-     * the APIs. If you do not specify a <code>CallerArn</code>, it defaults to the ARN
-     * of the user that you specify in <code>PolicySourceArn</code>, if you specified a
-     * user. If you include both a <code>PolicySourceArn</code> (for example,
-     * <code>arn:aws:iam::123456789012:user/David</code>) and a <code>CallerArn</code>
-     * (for example, <code>arn:aws:iam::123456789012:user/Bob</code>), the result is
-     * that you simulate calling the APIs as Bob, as if Bob had David's policies.</p>
+     * the API operations. If you do not specify a <code>CallerArn</code>, it defaults
+     * to the ARN of the user that you specify in <code>PolicySourceArn</code>, if you
+     * specified a user. If you include both a <code>PolicySourceArn</code> (for
+     * example, <code>arn:aws:iam::123456789012:user/David</code>) and a
+     * <code>CallerArn</code> (for example,
+     * <code>arn:aws:iam::123456789012:user/Bob</code>), the result is that you
+     * simulate calling the API operations as Bob, as if Bob had David's policies.</p>
      * <p>You can specify only the ARN of an IAM user. You cannot specify the ARN of an
      * assumed role, federated user, or a service principal.</p> <p>
      * <code>CallerArn</code> is required if you include a <code>ResourcePolicy</code>
@@ -814,8 +828,8 @@ namespace Model
 
 
     /**
-     * <p>Specifies the type of simulation to run. Different APIs that support
-     * resource-based policies require different combinations of resources. By
+     * <p>Specifies the type of simulation to run. Different API operations that
+     * support resource-based policies require different combinations of resources. By
      * specifying the type of simulation to run, you enable the policy simulator to
      * enforce the presence of the required resources to ensure reliable simulation
      * results. If your simulation does not match one of the following scenarios, then
@@ -828,7 +842,7 @@ namespace Model
      * subnet, then you must specify the subnet resource. For more information on the
      * EC2 scenario options, see <a
      * href="http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html">Supported
-     * Platforms</a> in the <i>AWS EC2 User Guide</i>.</p> <ul> <li> <p>
+     * Platforms</a> in the <i>Amazon EC2 User Guide</i>.</p> <ul> <li> <p>
      * <b>EC2-Classic-InstanceStore</b> </p> <p>instance, image, security-group</p>
      * </li> <li> <p> <b>EC2-Classic-EBS</b> </p> <p>instance, image, security-group,
      * volume</p> </li> <li> <p> <b>EC2-VPC-InstanceStore</b> </p> <p>instance, image,
@@ -842,8 +856,8 @@ namespace Model
     inline const Aws::String& GetResourceHandlingOption() const{ return m_resourceHandlingOption; }
 
     /**
-     * <p>Specifies the type of simulation to run. Different APIs that support
-     * resource-based policies require different combinations of resources. By
+     * <p>Specifies the type of simulation to run. Different API operations that
+     * support resource-based policies require different combinations of resources. By
      * specifying the type of simulation to run, you enable the policy simulator to
      * enforce the presence of the required resources to ensure reliable simulation
      * results. If your simulation does not match one of the following scenarios, then
@@ -856,7 +870,7 @@ namespace Model
      * subnet, then you must specify the subnet resource. For more information on the
      * EC2 scenario options, see <a
      * href="http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html">Supported
-     * Platforms</a> in the <i>AWS EC2 User Guide</i>.</p> <ul> <li> <p>
+     * Platforms</a> in the <i>Amazon EC2 User Guide</i>.</p> <ul> <li> <p>
      * <b>EC2-Classic-InstanceStore</b> </p> <p>instance, image, security-group</p>
      * </li> <li> <p> <b>EC2-Classic-EBS</b> </p> <p>instance, image, security-group,
      * volume</p> </li> <li> <p> <b>EC2-VPC-InstanceStore</b> </p> <p>instance, image,
@@ -870,8 +884,8 @@ namespace Model
     inline void SetResourceHandlingOption(const Aws::String& value) { m_resourceHandlingOptionHasBeenSet = true; m_resourceHandlingOption = value; }
 
     /**
-     * <p>Specifies the type of simulation to run. Different APIs that support
-     * resource-based policies require different combinations of resources. By
+     * <p>Specifies the type of simulation to run. Different API operations that
+     * support resource-based policies require different combinations of resources. By
      * specifying the type of simulation to run, you enable the policy simulator to
      * enforce the presence of the required resources to ensure reliable simulation
      * results. If your simulation does not match one of the following scenarios, then
@@ -884,7 +898,7 @@ namespace Model
      * subnet, then you must specify the subnet resource. For more information on the
      * EC2 scenario options, see <a
      * href="http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html">Supported
-     * Platforms</a> in the <i>AWS EC2 User Guide</i>.</p> <ul> <li> <p>
+     * Platforms</a> in the <i>Amazon EC2 User Guide</i>.</p> <ul> <li> <p>
      * <b>EC2-Classic-InstanceStore</b> </p> <p>instance, image, security-group</p>
      * </li> <li> <p> <b>EC2-Classic-EBS</b> </p> <p>instance, image, security-group,
      * volume</p> </li> <li> <p> <b>EC2-VPC-InstanceStore</b> </p> <p>instance, image,
@@ -898,8 +912,8 @@ namespace Model
     inline void SetResourceHandlingOption(Aws::String&& value) { m_resourceHandlingOptionHasBeenSet = true; m_resourceHandlingOption = std::move(value); }
 
     /**
-     * <p>Specifies the type of simulation to run. Different APIs that support
-     * resource-based policies require different combinations of resources. By
+     * <p>Specifies the type of simulation to run. Different API operations that
+     * support resource-based policies require different combinations of resources. By
      * specifying the type of simulation to run, you enable the policy simulator to
      * enforce the presence of the required resources to ensure reliable simulation
      * results. If your simulation does not match one of the following scenarios, then
@@ -912,7 +926,7 @@ namespace Model
      * subnet, then you must specify the subnet resource. For more information on the
      * EC2 scenario options, see <a
      * href="http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html">Supported
-     * Platforms</a> in the <i>AWS EC2 User Guide</i>.</p> <ul> <li> <p>
+     * Platforms</a> in the <i>Amazon EC2 User Guide</i>.</p> <ul> <li> <p>
      * <b>EC2-Classic-InstanceStore</b> </p> <p>instance, image, security-group</p>
      * </li> <li> <p> <b>EC2-Classic-EBS</b> </p> <p>instance, image, security-group,
      * volume</p> </li> <li> <p> <b>EC2-VPC-InstanceStore</b> </p> <p>instance, image,
@@ -926,8 +940,8 @@ namespace Model
     inline void SetResourceHandlingOption(const char* value) { m_resourceHandlingOptionHasBeenSet = true; m_resourceHandlingOption.assign(value); }
 
     /**
-     * <p>Specifies the type of simulation to run. Different APIs that support
-     * resource-based policies require different combinations of resources. By
+     * <p>Specifies the type of simulation to run. Different API operations that
+     * support resource-based policies require different combinations of resources. By
      * specifying the type of simulation to run, you enable the policy simulator to
      * enforce the presence of the required resources to ensure reliable simulation
      * results. If your simulation does not match one of the following scenarios, then
@@ -940,7 +954,7 @@ namespace Model
      * subnet, then you must specify the subnet resource. For more information on the
      * EC2 scenario options, see <a
      * href="http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html">Supported
-     * Platforms</a> in the <i>AWS EC2 User Guide</i>.</p> <ul> <li> <p>
+     * Platforms</a> in the <i>Amazon EC2 User Guide</i>.</p> <ul> <li> <p>
      * <b>EC2-Classic-InstanceStore</b> </p> <p>instance, image, security-group</p>
      * </li> <li> <p> <b>EC2-Classic-EBS</b> </p> <p>instance, image, security-group,
      * volume</p> </li> <li> <p> <b>EC2-VPC-InstanceStore</b> </p> <p>instance, image,
@@ -954,8 +968,8 @@ namespace Model
     inline SimulatePrincipalPolicyRequest& WithResourceHandlingOption(const Aws::String& value) { SetResourceHandlingOption(value); return *this;}
 
     /**
-     * <p>Specifies the type of simulation to run. Different APIs that support
-     * resource-based policies require different combinations of resources. By
+     * <p>Specifies the type of simulation to run. Different API operations that
+     * support resource-based policies require different combinations of resources. By
      * specifying the type of simulation to run, you enable the policy simulator to
      * enforce the presence of the required resources to ensure reliable simulation
      * results. If your simulation does not match one of the following scenarios, then
@@ -968,7 +982,7 @@ namespace Model
      * subnet, then you must specify the subnet resource. For more information on the
      * EC2 scenario options, see <a
      * href="http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html">Supported
-     * Platforms</a> in the <i>AWS EC2 User Guide</i>.</p> <ul> <li> <p>
+     * Platforms</a> in the <i>Amazon EC2 User Guide</i>.</p> <ul> <li> <p>
      * <b>EC2-Classic-InstanceStore</b> </p> <p>instance, image, security-group</p>
      * </li> <li> <p> <b>EC2-Classic-EBS</b> </p> <p>instance, image, security-group,
      * volume</p> </li> <li> <p> <b>EC2-VPC-InstanceStore</b> </p> <p>instance, image,
@@ -982,8 +996,8 @@ namespace Model
     inline SimulatePrincipalPolicyRequest& WithResourceHandlingOption(Aws::String&& value) { SetResourceHandlingOption(std::move(value)); return *this;}
 
     /**
-     * <p>Specifies the type of simulation to run. Different APIs that support
-     * resource-based policies require different combinations of resources. By
+     * <p>Specifies the type of simulation to run. Different API operations that
+     * support resource-based policies require different combinations of resources. By
      * specifying the type of simulation to run, you enable the policy simulator to
      * enforce the presence of the required resources to ensure reliable simulation
      * results. If your simulation does not match one of the following scenarios, then
@@ -996,7 +1010,7 @@ namespace Model
      * subnet, then you must specify the subnet resource. For more information on the
      * EC2 scenario options, see <a
      * href="http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html">Supported
-     * Platforms</a> in the <i>AWS EC2 User Guide</i>.</p> <ul> <li> <p>
+     * Platforms</a> in the <i>Amazon EC2 User Guide</i>.</p> <ul> <li> <p>
      * <b>EC2-Classic-InstanceStore</b> </p> <p>instance, image, security-group</p>
      * </li> <li> <p> <b>EC2-Classic-EBS</b> </p> <p>instance, image, security-group,
      * volume</p> </li> <li> <p> <b>EC2-VPC-InstanceStore</b> </p> <p>instance, image,
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateAccessKeyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateAccessKeyRequest.h
index 536f11cd6c5..45cfa6b3199 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateAccessKeyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateAccessKeyRequest.h
@@ -51,7 +51,8 @@ namespace Model
      * <p>The name of the user whose key you want to update.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -59,7 +60,8 @@ namespace Model
      * <p>The name of the user whose key you want to update.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -67,7 +69,8 @@ namespace Model
      * <p>The name of the user whose key you want to update.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -75,7 +78,8 @@ namespace Model
      * <p>The name of the user whose key you want to update.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -83,7 +87,8 @@ namespace Model
      * <p>The name of the user whose key you want to update.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline UpdateAccessKeyRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -91,7 +96,8 @@ namespace Model
      * <p>The name of the user whose key you want to update.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline UpdateAccessKeyRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -99,7 +105,8 @@ namespace Model
      * <p>The name of the user whose key you want to update.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline UpdateAccessKeyRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
@@ -163,36 +170,36 @@ namespace Model
 
     /**
      * <p> The status you want to assign to the secret access key. <code>Active</code>
-     * means the key can be used for API calls to AWS, while <code>Inactive</code>
-     * means the key cannot be used.</p>
+     * means that the key can be used for API calls to AWS, while <code>Inactive</code>
+     * means that the key cannot be used.</p>
      */
     inline const StatusType& GetStatus() const{ return m_status; }
 
     /**
      * <p> The status you want to assign to the secret access key. <code>Active</code>
-     * means the key can be used for API calls to AWS, while <code>Inactive</code>
-     * means the key cannot be used.</p>
+     * means that the key can be used for API calls to AWS, while <code>Inactive</code>
+     * means that the key cannot be used.</p>
      */
     inline void SetStatus(const StatusType& value) { m_statusHasBeenSet = true; m_status = value; }
 
     /**
      * <p> The status you want to assign to the secret access key. <code>Active</code>
-     * means the key can be used for API calls to AWS, while <code>Inactive</code>
-     * means the key cannot be used.</p>
+     * means that the key can be used for API calls to AWS, while <code>Inactive</code>
+     * means that the key cannot be used.</p>
      */
     inline void SetStatus(StatusType&& value) { m_statusHasBeenSet = true; m_status = std::move(value); }
 
     /**
      * <p> The status you want to assign to the secret access key. <code>Active</code>
-     * means the key can be used for API calls to AWS, while <code>Inactive</code>
-     * means the key cannot be used.</p>
+     * means that the key can be used for API calls to AWS, while <code>Inactive</code>
+     * means that the key cannot be used.</p>
      */
     inline UpdateAccessKeyRequest& WithStatus(const StatusType& value) { SetStatus(value); return *this;}
 
     /**
      * <p> The status you want to assign to the secret access key. <code>Active</code>
-     * means the key can be used for API calls to AWS, while <code>Inactive</code>
-     * means the key cannot be used.</p>
+     * means that the key can be used for API calls to AWS, while <code>Inactive</code>
+     * means that the key cannot be used.</p>
      */
     inline UpdateAccessKeyRequest& WithStatus(StatusType&& value) { SetStatus(std::move(value)); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateAccountPasswordPolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateAccountPasswordPolicyRequest.h
index dee1747362f..ced744a7f0d 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateAccountPasswordPolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateAccountPasswordPolicyRequest.h
@@ -45,20 +45,23 @@ namespace Model
   public:
 
     /**
-     * <p>The minimum number of characters allowed in an IAM user password.</p>
-     * <p>Default value: 6</p>
+     * <p>The minimum number of characters allowed in an IAM user password.</p> <p>If
+     * you do not specify a value for this parameter, then the operation uses the
+     * default value of <code>6</code>.</p>
      */
     inline int GetMinimumPasswordLength() const{ return m_minimumPasswordLength; }
 
     /**
-     * <p>The minimum number of characters allowed in an IAM user password.</p>
-     * <p>Default value: 6</p>
+     * <p>The minimum number of characters allowed in an IAM user password.</p> <p>If
+     * you do not specify a value for this parameter, then the operation uses the
+     * default value of <code>6</code>.</p>
      */
     inline void SetMinimumPasswordLength(int value) { m_minimumPasswordLengthHasBeenSet = true; m_minimumPasswordLength = value; }
 
     /**
-     * <p>The minimum number of characters allowed in an IAM user password.</p>
-     * <p>Default value: 6</p>
+     * <p>The minimum number of characters allowed in an IAM user password.</p> <p>If
+     * you do not specify a value for this parameter, then the operation uses the
+     * default value of <code>6</code>.</p>
      */
     inline UpdateAccountPasswordPolicyRequest& WithMinimumPasswordLength(int value) { SetMinimumPasswordLength(value); return *this;}
 
@@ -66,84 +69,108 @@ namespace Model
     /**
      * <p>Specifies whether IAM user passwords must contain at least one of the
      * following non-alphanumeric characters:</p> <p>! @ # $ % ^ &amp;amp; * ( ) _ + -
-     * = [ ] { } | '</p> <p>Default value: false</p>
+     * = [ ] { } | '</p> <p>If you do not specify a value for this parameter, then the
+     * operation uses the default value of <code>false</code>. The result is that
+     * passwords do not require at least one symbol character.</p>
      */
     inline bool GetRequireSymbols() const{ return m_requireSymbols; }
 
     /**
      * <p>Specifies whether IAM user passwords must contain at least one of the
      * following non-alphanumeric characters:</p> <p>! @ # $ % ^ &amp;amp; * ( ) _ + -
-     * = [ ] { } | '</p> <p>Default value: false</p>
+     * = [ ] { } | '</p> <p>If you do not specify a value for this parameter, then the
+     * operation uses the default value of <code>false</code>. The result is that
+     * passwords do not require at least one symbol character.</p>
      */
     inline void SetRequireSymbols(bool value) { m_requireSymbolsHasBeenSet = true; m_requireSymbols = value; }
 
     /**
      * <p>Specifies whether IAM user passwords must contain at least one of the
      * following non-alphanumeric characters:</p> <p>! @ # $ % ^ &amp;amp; * ( ) _ + -
-     * = [ ] { } | '</p> <p>Default value: false</p>
+     * = [ ] { } | '</p> <p>If you do not specify a value for this parameter, then the
+     * operation uses the default value of <code>false</code>. The result is that
+     * passwords do not require at least one symbol character.</p>
      */
     inline UpdateAccountPasswordPolicyRequest& WithRequireSymbols(bool value) { SetRequireSymbols(value); return *this;}
 
 
     /**
      * <p>Specifies whether IAM user passwords must contain at least one numeric
-     * character (0 to 9).</p> <p>Default value: false</p>
+     * character (0 to 9).</p> <p>If you do not specify a value for this parameter,
+     * then the operation uses the default value of <code>false</code>. The result is
+     * that passwords do not require at least one numeric character.</p>
      */
     inline bool GetRequireNumbers() const{ return m_requireNumbers; }
 
     /**
      * <p>Specifies whether IAM user passwords must contain at least one numeric
-     * character (0 to 9).</p> <p>Default value: false</p>
+     * character (0 to 9).</p> <p>If you do not specify a value for this parameter,
+     * then the operation uses the default value of <code>false</code>. The result is
+     * that passwords do not require at least one numeric character.</p>
      */
     inline void SetRequireNumbers(bool value) { m_requireNumbersHasBeenSet = true; m_requireNumbers = value; }
 
     /**
      * <p>Specifies whether IAM user passwords must contain at least one numeric
-     * character (0 to 9).</p> <p>Default value: false</p>
+     * character (0 to 9).</p> <p>If you do not specify a value for this parameter,
+     * then the operation uses the default value of <code>false</code>. The result is
+     * that passwords do not require at least one numeric character.</p>
      */
     inline UpdateAccountPasswordPolicyRequest& WithRequireNumbers(bool value) { SetRequireNumbers(value); return *this;}
 
 
     /**
      * <p>Specifies whether IAM user passwords must contain at least one uppercase
-     * character from the ISO basic Latin alphabet (A to Z).</p> <p>Default value:
-     * false</p>
+     * character from the ISO basic Latin alphabet (A to Z).</p> <p>If you do not
+     * specify a value for this parameter, then the operation uses the default value of
+     * <code>false</code>. The result is that passwords do not require at least one
+     * uppercase character.</p>
      */
     inline bool GetRequireUppercaseCharacters() const{ return m_requireUppercaseCharacters; }
 
     /**
      * <p>Specifies whether IAM user passwords must contain at least one uppercase
-     * character from the ISO basic Latin alphabet (A to Z).</p> <p>Default value:
-     * false</p>
+     * character from the ISO basic Latin alphabet (A to Z).</p> <p>If you do not
+     * specify a value for this parameter, then the operation uses the default value of
+     * <code>false</code>. The result is that passwords do not require at least one
+     * uppercase character.</p>
      */
     inline void SetRequireUppercaseCharacters(bool value) { m_requireUppercaseCharactersHasBeenSet = true; m_requireUppercaseCharacters = value; }
 
     /**
      * <p>Specifies whether IAM user passwords must contain at least one uppercase
-     * character from the ISO basic Latin alphabet (A to Z).</p> <p>Default value:
-     * false</p>
+     * character from the ISO basic Latin alphabet (A to Z).</p> <p>If you do not
+     * specify a value for this parameter, then the operation uses the default value of
+     * <code>false</code>. The result is that passwords do not require at least one
+     * uppercase character.</p>
      */
     inline UpdateAccountPasswordPolicyRequest& WithRequireUppercaseCharacters(bool value) { SetRequireUppercaseCharacters(value); return *this;}
 
 
     /**
      * <p>Specifies whether IAM user passwords must contain at least one lowercase
-     * character from the ISO basic Latin alphabet (a to z).</p> <p>Default value:
-     * false</p>
+     * character from the ISO basic Latin alphabet (a to z).</p> <p>If you do not
+     * specify a value for this parameter, then the operation uses the default value of
+     * <code>false</code>. The result is that passwords do not require at least one
+     * lowercase character.</p>
      */
     inline bool GetRequireLowercaseCharacters() const{ return m_requireLowercaseCharacters; }
 
     /**
      * <p>Specifies whether IAM user passwords must contain at least one lowercase
-     * character from the ISO basic Latin alphabet (a to z).</p> <p>Default value:
-     * false</p>
+     * character from the ISO basic Latin alphabet (a to z).</p> <p>If you do not
+     * specify a value for this parameter, then the operation uses the default value of
+     * <code>false</code>. The result is that passwords do not require at least one
+     * lowercase character.</p>
      */
     inline void SetRequireLowercaseCharacters(bool value) { m_requireLowercaseCharactersHasBeenSet = true; m_requireLowercaseCharacters = value; }
 
     /**
      * <p>Specifies whether IAM user passwords must contain at least one lowercase
-     * character from the ISO basic Latin alphabet (a to z).</p> <p>Default value:
-     * false</p>
+     * character from the ISO basic Latin alphabet (a to z).</p> <p>If you do not
+     * specify a value for this parameter, then the operation uses the default value of
+     * <code>false</code>. The result is that passwords do not require at least one
+     * lowercase character.</p>
      */
     inline UpdateAccountPasswordPolicyRequest& WithRequireLowercaseCharacters(bool value) { SetRequireLowercaseCharacters(value); return *this;}
 
@@ -152,8 +179,10 @@ namespace Model
      * <p> Allows all IAM users in your account to use the AWS Management Console to
      * change their own passwords. For more information, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/HowToPwdIAMUser.html">Letting
-     * IAM Users Change Their Own Passwords</a> in the <i>IAM User Guide</i>.</p>
-     * <p>Default value: false</p>
+     * IAM Users Change Their Own Passwords</a> in the <i>IAM User Guide</i>.</p> <p>If
+     * you do not specify a value for this parameter, then the operation uses the
+     * default value of <code>false</code>. The result is that IAM users in the account
+     * do not automatically have permissions to change their own password.</p>
      */
     inline bool GetAllowUsersToChangePassword() const{ return m_allowUsersToChangePassword; }
 
@@ -161,8 +190,10 @@ namespace Model
      * <p> Allows all IAM users in your account to use the AWS Management Console to
      * change their own passwords. For more information, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/HowToPwdIAMUser.html">Letting
-     * IAM Users Change Their Own Passwords</a> in the <i>IAM User Guide</i>.</p>
-     * <p>Default value: false</p>
+     * IAM Users Change Their Own Passwords</a> in the <i>IAM User Guide</i>.</p> <p>If
+     * you do not specify a value for this parameter, then the operation uses the
+     * default value of <code>false</code>. The result is that IAM users in the account
+     * do not automatically have permissions to change their own password.</p>
      */
     inline void SetAllowUsersToChangePassword(bool value) { m_allowUsersToChangePasswordHasBeenSet = true; m_allowUsersToChangePassword = value; }
 
@@ -170,68 +201,88 @@ namespace Model
      * <p> Allows all IAM users in your account to use the AWS Management Console to
      * change their own passwords. For more information, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/HowToPwdIAMUser.html">Letting
-     * IAM Users Change Their Own Passwords</a> in the <i>IAM User Guide</i>.</p>
-     * <p>Default value: false</p>
+     * IAM Users Change Their Own Passwords</a> in the <i>IAM User Guide</i>.</p> <p>If
+     * you do not specify a value for this parameter, then the operation uses the
+     * default value of <code>false</code>. The result is that IAM users in the account
+     * do not automatically have permissions to change their own password.</p>
      */
     inline UpdateAccountPasswordPolicyRequest& WithAllowUsersToChangePassword(bool value) { SetAllowUsersToChangePassword(value); return *this;}
 
 
     /**
-     * <p>The number of days that an IAM user password is valid. The default value of 0
-     * means IAM user passwords never expire.</p> <p>Default value: 0</p>
+     * <p>The number of days that an IAM user password is valid.</p> <p>If you do not
+     * specify a value for this parameter, then the operation uses the default value of
+     * <code>0</code>. The result is that IAM user passwords never expire.</p>
      */
     inline int GetMaxPasswordAge() const{ return m_maxPasswordAge; }
 
     /**
-     * <p>The number of days that an IAM user password is valid. The default value of 0
-     * means IAM user passwords never expire.</p> <p>Default value: 0</p>
+     * <p>The number of days that an IAM user password is valid.</p> <p>If you do not
+     * specify a value for this parameter, then the operation uses the default value of
+     * <code>0</code>. The result is that IAM user passwords never expire.</p>
      */
     inline void SetMaxPasswordAge(int value) { m_maxPasswordAgeHasBeenSet = true; m_maxPasswordAge = value; }
 
     /**
-     * <p>The number of days that an IAM user password is valid. The default value of 0
-     * means IAM user passwords never expire.</p> <p>Default value: 0</p>
+     * <p>The number of days that an IAM user password is valid.</p> <p>If you do not
+     * specify a value for this parameter, then the operation uses the default value of
+     * <code>0</code>. The result is that IAM user passwords never expire.</p>
      */
     inline UpdateAccountPasswordPolicyRequest& WithMaxPasswordAge(int value) { SetMaxPasswordAge(value); return *this;}
 
 
     /**
      * <p>Specifies the number of previous passwords that IAM users are prevented from
-     * reusing. The default value of 0 means IAM users are not prevented from reusing
-     * previous passwords.</p> <p>Default value: 0</p>
+     * reusing.</p> <p>If you do not specify a value for this parameter, then the
+     * operation uses the default value of <code>0</code>. The result is that IAM users
+     * are not prevented from reusing previous passwords.</p>
      */
     inline int GetPasswordReusePrevention() const{ return m_passwordReusePrevention; }
 
     /**
      * <p>Specifies the number of previous passwords that IAM users are prevented from
-     * reusing. The default value of 0 means IAM users are not prevented from reusing
-     * previous passwords.</p> <p>Default value: 0</p>
+     * reusing.</p> <p>If you do not specify a value for this parameter, then the
+     * operation uses the default value of <code>0</code>. The result is that IAM users
+     * are not prevented from reusing previous passwords.</p>
      */
     inline void SetPasswordReusePrevention(int value) { m_passwordReusePreventionHasBeenSet = true; m_passwordReusePrevention = value; }
 
     /**
      * <p>Specifies the number of previous passwords that IAM users are prevented from
-     * reusing. The default value of 0 means IAM users are not prevented from reusing
-     * previous passwords.</p> <p>Default value: 0</p>
+     * reusing.</p> <p>If you do not specify a value for this parameter, then the
+     * operation uses the default value of <code>0</code>. The result is that IAM users
+     * are not prevented from reusing previous passwords.</p>
      */
     inline UpdateAccountPasswordPolicyRequest& WithPasswordReusePrevention(int value) { SetPasswordReusePrevention(value); return *this;}
 
 
     /**
      * <p>Prevents IAM users from setting a new password after their password has
-     * expired.</p> <p>Default value: false</p>
+     * expired. The IAM user cannot be accessed until an administrator resets the
+     * password.</p> <p>If you do not specify a value for this parameter, then the
+     * operation uses the default value of <code>false</code>. The result is that IAM
+     * users can change their passwords after they expire and continue to sign in as
+     * the user.</p>
      */
     inline bool GetHardExpiry() const{ return m_hardExpiry; }
 
     /**
      * <p>Prevents IAM users from setting a new password after their password has
-     * expired.</p> <p>Default value: false</p>
+     * expired. The IAM user cannot be accessed until an administrator resets the
+     * password.</p> <p>If you do not specify a value for this parameter, then the
+     * operation uses the default value of <code>false</code>. The result is that IAM
+     * users can change their passwords after they expire and continue to sign in as
+     * the user.</p>
      */
     inline void SetHardExpiry(bool value) { m_hardExpiryHasBeenSet = true; m_hardExpiry = value; }
 
     /**
      * <p>Prevents IAM users from setting a new password after their password has
-     * expired.</p> <p>Default value: false</p>
+     * expired. The IAM user cannot be accessed until an administrator resets the
+     * password.</p> <p>If you do not specify a value for this parameter, then the
+     * operation uses the default value of <code>false</code>. The result is that IAM
+     * users can change their passwords after they expire and continue to sign in as
+     * the user.</p>
      */
     inline UpdateAccountPasswordPolicyRequest& WithHardExpiry(bool value) { SetHardExpiry(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateAssumeRolePolicyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateAssumeRolePolicyRequest.h
index 9a5b8eaed84..cb5c80aba7d 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateAssumeRolePolicyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateAssumeRolePolicyRequest.h
@@ -113,77 +113,84 @@ namespace Model
     /**
      * <p>The policy that grants an entity permission to assume the role.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline const Aws::String& GetPolicyDocument() const{ return m_policyDocument; }
 
     /**
      * <p>The policy that grants an entity permission to assume the role.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyDocument(const Aws::String& value) { m_policyDocumentHasBeenSet = true; m_policyDocument = value; }
 
     /**
      * <p>The policy that grants an entity permission to assume the role.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyDocument(Aws::String&& value) { m_policyDocumentHasBeenSet = true; m_policyDocument = std::move(value); }
 
     /**
      * <p>The policy that grants an entity permission to assume the role.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPolicyDocument(const char* value) { m_policyDocumentHasBeenSet = true; m_policyDocument.assign(value); }
 
     /**
      * <p>The policy that grants an entity permission to assume the role.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline UpdateAssumeRolePolicyRequest& WithPolicyDocument(const Aws::String& value) { SetPolicyDocument(value); return *this;}
 
     /**
      * <p>The policy that grants an entity permission to assume the role.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline UpdateAssumeRolePolicyRequest& WithPolicyDocument(Aws::String&& value) { SetPolicyDocument(std::move(value)); return *this;}
 
     /**
      * <p>The policy that grants an entity permission to assume the role.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline UpdateAssumeRolePolicyRequest& WithPolicyDocument(const char* value) { SetPolicyDocument(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateGroupRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateGroupRequest.h
index 3d99a90cc9e..461f4579f88 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateGroupRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateGroupRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * this is the original name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetGroupName() const{ return m_groupName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * this is the original name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const Aws::String& value) { m_groupNameHasBeenSet = true; m_groupName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * this is the original name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(Aws::String&& value) { m_groupNameHasBeenSet = true; m_groupName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * this is the original name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetGroupName(const char* value) { m_groupNameHasBeenSet = true; m_groupName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * this is the original name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline UpdateGroupRequest& WithGroupName(const Aws::String& value) { SetGroupName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * this is the original name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline UpdateGroupRequest& WithGroupName(Aws::String&& value) { SetGroupName(std::move(value)); return *this;}
 
@@ -105,85 +105,85 @@ namespace Model
      * this is the original name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline UpdateGroupRequest& WithGroupName(const char* value) { SetGroupName(value); return *this;}
 
 
     /**
      * <p>New path for the IAM group. Only include this if changing the group's
-     * path.</p> <p>This paramater allows (per its <a
+     * path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline const Aws::String& GetNewPath() const{ return m_newPath; }
 
     /**
      * <p>New path for the IAM group. Only include this if changing the group's
-     * path.</p> <p>This paramater allows (per its <a
+     * path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline void SetNewPath(const Aws::String& value) { m_newPathHasBeenSet = true; m_newPath = value; }
 
     /**
      * <p>New path for the IAM group. Only include this if changing the group's
-     * path.</p> <p>This paramater allows (per its <a
+     * path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline void SetNewPath(Aws::String&& value) { m_newPathHasBeenSet = true; m_newPath = std::move(value); }
 
     /**
      * <p>New path for the IAM group. Only include this if changing the group's
-     * path.</p> <p>This paramater allows (per its <a
+     * path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline void SetNewPath(const char* value) { m_newPathHasBeenSet = true; m_newPath.assign(value); }
 
     /**
      * <p>New path for the IAM group. Only include this if changing the group's
-     * path.</p> <p>This paramater allows (per its <a
+     * path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline UpdateGroupRequest& WithNewPath(const Aws::String& value) { SetNewPath(value); return *this;}
 
     /**
      * <p>New path for the IAM group. Only include this if changing the group's
-     * path.</p> <p>This paramater allows (per its <a
+     * path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline UpdateGroupRequest& WithNewPath(Aws::String&& value) { SetNewPath(std::move(value)); return *this;}
 
     /**
      * <p>New path for the IAM group. Only include this if changing the group's
-     * path.</p> <p>This paramater allows (per its <a
+     * path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline UpdateGroupRequest& WithNewPath(const char* value) { SetNewPath(value); return *this;}
 
@@ -193,7 +193,7 @@ namespace Model
      * name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetNewGroupName() const{ return m_newGroupName; }
 
@@ -202,7 +202,7 @@ namespace Model
      * name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetNewGroupName(const Aws::String& value) { m_newGroupNameHasBeenSet = true; m_newGroupName = value; }
 
@@ -211,7 +211,7 @@ namespace Model
      * name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetNewGroupName(Aws::String&& value) { m_newGroupNameHasBeenSet = true; m_newGroupName = std::move(value); }
 
@@ -220,7 +220,7 @@ namespace Model
      * name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetNewGroupName(const char* value) { m_newGroupNameHasBeenSet = true; m_newGroupName.assign(value); }
 
@@ -229,7 +229,7 @@ namespace Model
      * name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline UpdateGroupRequest& WithNewGroupName(const Aws::String& value) { SetNewGroupName(value); return *this;}
 
@@ -238,7 +238,7 @@ namespace Model
      * name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline UpdateGroupRequest& WithNewGroupName(Aws::String&& value) { SetNewGroupName(std::move(value)); return *this;}
 
@@ -247,7 +247,7 @@ namespace Model
      * name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline UpdateGroupRequest& WithNewGroupName(const char* value) { SetNewGroupName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateLoginProfileRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateLoginProfileRequest.h
index d086a85ca49..b75d486431d 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateLoginProfileRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateLoginProfileRequest.h
@@ -50,7 +50,8 @@ namespace Model
      * <p>The name of the user whose password you want to update.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -58,7 +59,8 @@ namespace Model
      * <p>The name of the user whose password you want to update.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -66,7 +68,8 @@ namespace Model
      * <p>The name of the user whose password you want to update.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -74,7 +77,8 @@ namespace Model
      * <p>The name of the user whose password you want to update.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -82,7 +86,8 @@ namespace Model
      * <p>The name of the user whose password you want to update.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline UpdateLoginProfileRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -90,7 +95,8 @@ namespace Model
      * <p>The name of the user whose password you want to update.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline UpdateLoginProfileRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -98,7 +104,8 @@ namespace Model
      * <p>The name of the user whose password you want to update.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline UpdateLoginProfileRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
@@ -106,13 +113,14 @@ namespace Model
     /**
      * <p>The new password for the specified IAM user.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).
-     * However, the format can be further restricted by the account administrator by
-     * setting a password policy on the AWS account. For more information, see
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul> <p>However, the format
+     * can be further restricted by the account administrator by setting a password
+     * policy on the AWS account. For more information, see
      * <a>UpdateAccountPasswordPolicy</a>.</p>
      */
     inline const Aws::String& GetPassword() const{ return m_password; }
@@ -120,13 +128,14 @@ namespace Model
     /**
      * <p>The new password for the specified IAM user.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).
-     * However, the format can be further restricted by the account administrator by
-     * setting a password policy on the AWS account. For more information, see
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul> <p>However, the format
+     * can be further restricted by the account administrator by setting a password
+     * policy on the AWS account. For more information, see
      * <a>UpdateAccountPasswordPolicy</a>.</p>
      */
     inline void SetPassword(const Aws::String& value) { m_passwordHasBeenSet = true; m_password = value; }
@@ -134,13 +143,14 @@ namespace Model
     /**
      * <p>The new password for the specified IAM user.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).
-     * However, the format can be further restricted by the account administrator by
-     * setting a password policy on the AWS account. For more information, see
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul> <p>However, the format
+     * can be further restricted by the account administrator by setting a password
+     * policy on the AWS account. For more information, see
      * <a>UpdateAccountPasswordPolicy</a>.</p>
      */
     inline void SetPassword(Aws::String&& value) { m_passwordHasBeenSet = true; m_password = std::move(value); }
@@ -148,13 +158,14 @@ namespace Model
     /**
      * <p>The new password for the specified IAM user.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).
-     * However, the format can be further restricted by the account administrator by
-     * setting a password policy on the AWS account. For more information, see
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul> <p>However, the format
+     * can be further restricted by the account administrator by setting a password
+     * policy on the AWS account. For more information, see
      * <a>UpdateAccountPasswordPolicy</a>.</p>
      */
     inline void SetPassword(const char* value) { m_passwordHasBeenSet = true; m_password.assign(value); }
@@ -162,13 +173,14 @@ namespace Model
     /**
      * <p>The new password for the specified IAM user.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).
-     * However, the format can be further restricted by the account administrator by
-     * setting a password policy on the AWS account. For more information, see
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul> <p>However, the format
+     * can be further restricted by the account administrator by setting a password
+     * policy on the AWS account. For more information, see
      * <a>UpdateAccountPasswordPolicy</a>.</p>
      */
     inline UpdateLoginProfileRequest& WithPassword(const Aws::String& value) { SetPassword(value); return *this;}
@@ -176,13 +188,14 @@ namespace Model
     /**
      * <p>The new password for the specified IAM user.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).
-     * However, the format can be further restricted by the account administrator by
-     * setting a password policy on the AWS account. For more information, see
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul> <p>However, the format
+     * can be further restricted by the account administrator by setting a password
+     * policy on the AWS account. For more information, see
      * <a>UpdateAccountPasswordPolicy</a>.</p>
      */
     inline UpdateLoginProfileRequest& WithPassword(Aws::String&& value) { SetPassword(std::move(value)); return *this;}
@@ -190,13 +203,14 @@ namespace Model
     /**
      * <p>The new password for the specified IAM user.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).
-     * However, the format can be further restricted by the account administrator by
-     * setting a password policy on the AWS account. For more information, see
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul> <p>However, the format
+     * can be further restricted by the account administrator by setting a password
+     * policy on the AWS account. For more information, see
      * <a>UpdateAccountPasswordPolicy</a>.</p>
      */
     inline UpdateLoginProfileRequest& WithPassword(const char* value) { SetPassword(value); return *this;}
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateOpenIDConnectProviderThumbprintRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateOpenIDConnectProviderThumbprintRequest.h
index 2170281ca6d..c0d17574aaf 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateOpenIDConnectProviderThumbprintRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateOpenIDConnectProviderThumbprintRequest.h
@@ -50,7 +50,7 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OIDC provider resource object for
      * which you want to update the thumbprint. You can get a list of OIDC provider
-     * ARNs by using the <a>ListOpenIDConnectProviders</a> action.</p> <p>For more
+     * ARNs by using the <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more
      * information about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
@@ -61,7 +61,7 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OIDC provider resource object for
      * which you want to update the thumbprint. You can get a list of OIDC provider
-     * ARNs by using the <a>ListOpenIDConnectProviders</a> action.</p> <p>For more
+     * ARNs by using the <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more
      * information about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
@@ -72,7 +72,7 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OIDC provider resource object for
      * which you want to update the thumbprint. You can get a list of OIDC provider
-     * ARNs by using the <a>ListOpenIDConnectProviders</a> action.</p> <p>For more
+     * ARNs by using the <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more
      * information about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
@@ -83,7 +83,7 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OIDC provider resource object for
      * which you want to update the thumbprint. You can get a list of OIDC provider
-     * ARNs by using the <a>ListOpenIDConnectProviders</a> action.</p> <p>For more
+     * ARNs by using the <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more
      * information about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
@@ -94,7 +94,7 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OIDC provider resource object for
      * which you want to update the thumbprint. You can get a list of OIDC provider
-     * ARNs by using the <a>ListOpenIDConnectProviders</a> action.</p> <p>For more
+     * ARNs by using the <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more
      * information about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
@@ -105,7 +105,7 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OIDC provider resource object for
      * which you want to update the thumbprint. You can get a list of OIDC provider
-     * ARNs by using the <a>ListOpenIDConnectProviders</a> action.</p> <p>For more
+     * ARNs by using the <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more
      * information about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
@@ -116,7 +116,7 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of the IAM OIDC provider resource object for
      * which you want to update the thumbprint. You can get a list of OIDC provider
-     * ARNs by using the <a>ListOpenIDConnectProviders</a> action.</p> <p>For more
+     * ARNs by using the <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more
      * information about ARNs, see <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateRoleRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateRoleRequest.h
new file mode 100644
index 00000000000..6045bf2053e
--- /dev/null
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateRoleRequest.h
@@ -0,0 +1,192 @@
+/*
+* Copyright 2010-2017 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.
+*/
+
+#pragma once
+#include <aws/iam/IAM_EXPORTS.h>
+#include <aws/iam/IAMRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+namespace IAM
+{
+namespace Model
+{
+
+  /**
+   */
+  class AWS_IAM_API UpdateRoleRequest : public IAMRequest
+  {
+  public:
+    UpdateRoleRequest();
+    
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "UpdateRole"; }
+
+    Aws::String SerializePayload() const override;
+
+  protected:
+    void DumpBodyToUrl(Aws::Http::URI& uri ) const override;
+
+  public:
+
+    /**
+     * <p>The name of the role that you want to modify.</p>
+     */
+    inline const Aws::String& GetRoleName() const{ return m_roleName; }
+
+    /**
+     * <p>The name of the role that you want to modify.</p>
+     */
+    inline void SetRoleName(const Aws::String& value) { m_roleNameHasBeenSet = true; m_roleName = value; }
+
+    /**
+     * <p>The name of the role that you want to modify.</p>
+     */
+    inline void SetRoleName(Aws::String&& value) { m_roleNameHasBeenSet = true; m_roleName = std::move(value); }
+
+    /**
+     * <p>The name of the role that you want to modify.</p>
+     */
+    inline void SetRoleName(const char* value) { m_roleNameHasBeenSet = true; m_roleName.assign(value); }
+
+    /**
+     * <p>The name of the role that you want to modify.</p>
+     */
+    inline UpdateRoleRequest& WithRoleName(const Aws::String& value) { SetRoleName(value); return *this;}
+
+    /**
+     * <p>The name of the role that you want to modify.</p>
+     */
+    inline UpdateRoleRequest& WithRoleName(Aws::String&& value) { SetRoleName(std::move(value)); return *this;}
+
+    /**
+     * <p>The name of the role that you want to modify.</p>
+     */
+    inline UpdateRoleRequest& WithRoleName(const char* value) { SetRoleName(value); return *this;}
+
+
+    /**
+     * <p>The new description that you want to apply to the specified role.</p>
+     */
+    inline const Aws::String& GetDescription() const{ return m_description; }
+
+    /**
+     * <p>The new description that you want to apply to the specified role.</p>
+     */
+    inline void SetDescription(const Aws::String& value) { m_descriptionHasBeenSet = true; m_description = value; }
+
+    /**
+     * <p>The new description that you want to apply to the specified role.</p>
+     */
+    inline void SetDescription(Aws::String&& value) { m_descriptionHasBeenSet = true; m_description = std::move(value); }
+
+    /**
+     * <p>The new description that you want to apply to the specified role.</p>
+     */
+    inline void SetDescription(const char* value) { m_descriptionHasBeenSet = true; m_description.assign(value); }
+
+    /**
+     * <p>The new description that you want to apply to the specified role.</p>
+     */
+    inline UpdateRoleRequest& WithDescription(const Aws::String& value) { SetDescription(value); return *this;}
+
+    /**
+     * <p>The new description that you want to apply to the specified role.</p>
+     */
+    inline UpdateRoleRequest& WithDescription(Aws::String&& value) { SetDescription(std::move(value)); return *this;}
+
+    /**
+     * <p>The new description that you want to apply to the specified role.</p>
+     */
+    inline UpdateRoleRequest& WithDescription(const char* value) { SetDescription(value); return *this;}
+
+
+    /**
+     * <p>The maximum session duration (in seconds) that you want to set for the
+     * specified role. If you do not specify a value for this setting, the default
+     * maximum of one hour is applied. This setting can have a value from 1 hour to 12
+     * hours.</p> <p>Anyone who assumes the role from the AWS CLI or API can use the
+     * <code>DurationSeconds</code> API parameter or the <code>duration-seconds</code>
+     * CLI parameter to request a longer session. The <code>MaxSessionDuration</code>
+     * setting determines the maximum duration that can be requested using the
+     * <code>DurationSeconds</code> parameter. If users don't specify a value for the
+     * <code>DurationSeconds</code> parameter, their security credentials are valid for
+     * one hour by default. This applies when you use the <code>AssumeRole*</code> API
+     * operations or the <code>assume-role*</code> CLI operations but does not apply
+     * when you use those operations to create a console URL. For more information, see
+     * <a
+     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html">Using
+     * IAM Roles</a> in the <i>IAM User Guide</i>.</p>
+     */
+    inline int GetMaxSessionDuration() const{ return m_maxSessionDuration; }
+
+    /**
+     * <p>The maximum session duration (in seconds) that you want to set for the
+     * specified role. If you do not specify a value for this setting, the default
+     * maximum of one hour is applied. This setting can have a value from 1 hour to 12
+     * hours.</p> <p>Anyone who assumes the role from the AWS CLI or API can use the
+     * <code>DurationSeconds</code> API parameter or the <code>duration-seconds</code>
+     * CLI parameter to request a longer session. The <code>MaxSessionDuration</code>
+     * setting determines the maximum duration that can be requested using the
+     * <code>DurationSeconds</code> parameter. If users don't specify a value for the
+     * <code>DurationSeconds</code> parameter, their security credentials are valid for
+     * one hour by default. This applies when you use the <code>AssumeRole*</code> API
+     * operations or the <code>assume-role*</code> CLI operations but does not apply
+     * when you use those operations to create a console URL. For more information, see
+     * <a
+     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html">Using
+     * IAM Roles</a> in the <i>IAM User Guide</i>.</p>
+     */
+    inline void SetMaxSessionDuration(int value) { m_maxSessionDurationHasBeenSet = true; m_maxSessionDuration = value; }
+
+    /**
+     * <p>The maximum session duration (in seconds) that you want to set for the
+     * specified role. If you do not specify a value for this setting, the default
+     * maximum of one hour is applied. This setting can have a value from 1 hour to 12
+     * hours.</p> <p>Anyone who assumes the role from the AWS CLI or API can use the
+     * <code>DurationSeconds</code> API parameter or the <code>duration-seconds</code>
+     * CLI parameter to request a longer session. The <code>MaxSessionDuration</code>
+     * setting determines the maximum duration that can be requested using the
+     * <code>DurationSeconds</code> parameter. If users don't specify a value for the
+     * <code>DurationSeconds</code> parameter, their security credentials are valid for
+     * one hour by default. This applies when you use the <code>AssumeRole*</code> API
+     * operations or the <code>assume-role*</code> CLI operations but does not apply
+     * when you use those operations to create a console URL. For more information, see
+     * <a
+     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html">Using
+     * IAM Roles</a> in the <i>IAM User Guide</i>.</p>
+     */
+    inline UpdateRoleRequest& WithMaxSessionDuration(int value) { SetMaxSessionDuration(value); return *this;}
+
+  private:
+
+    Aws::String m_roleName;
+    bool m_roleNameHasBeenSet;
+
+    Aws::String m_description;
+    bool m_descriptionHasBeenSet;
+
+    int m_maxSessionDuration;
+    bool m_maxSessionDurationHasBeenSet;
+  };
+
+} // namespace Model
+} // namespace IAM
+} // namespace Aws
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateRoleResult.h b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateRoleResult.h
new file mode 100644
index 00000000000..80c09df461d
--- /dev/null
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateRoleResult.h
@@ -0,0 +1,67 @@
+/*
+* Copyright 2010-2017 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.
+*/
+
+#pragma once
+#include <aws/iam/IAM_EXPORTS.h>
+#include <aws/iam/model/ResponseMetadata.h>
+#include <utility>
+
+namespace Aws
+{
+template<typename RESULT_TYPE>
+class AmazonWebServiceResult;
+
+namespace Utils
+{
+namespace Xml
+{
+  class XmlDocument;
+} // namespace Xml
+} // namespace Utils
+namespace IAM
+{
+namespace Model
+{
+  class AWS_IAM_API UpdateRoleResult
+  {
+  public:
+    UpdateRoleResult();
+    UpdateRoleResult(const Aws::AmazonWebServiceResult<Aws::Utils::Xml::XmlDocument>& result);
+    UpdateRoleResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Xml::XmlDocument>& result);
+
+
+    
+    inline const ResponseMetadata& GetResponseMetadata() const{ return m_responseMetadata; }
+
+    
+    inline void SetResponseMetadata(const ResponseMetadata& value) { m_responseMetadata = value; }
+
+    
+    inline void SetResponseMetadata(ResponseMetadata&& value) { m_responseMetadata = std::move(value); }
+
+    
+    inline UpdateRoleResult& WithResponseMetadata(const ResponseMetadata& value) { SetResponseMetadata(value); return *this;}
+
+    
+    inline UpdateRoleResult& WithResponseMetadata(ResponseMetadata&& value) { SetResponseMetadata(std::move(value)); return *this;}
+
+  private:
+
+    ResponseMetadata m_responseMetadata;
+  };
+
+} // namespace Model
+} // namespace IAM
+} // namespace Aws
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateSSHPublicKeyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateSSHPublicKeyRequest.h
index 7fd653f4629..4a9e9ab3c8c 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateSSHPublicKeyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateSSHPublicKeyRequest.h
@@ -52,7 +52,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -61,7 +61,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -70,7 +70,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -79,7 +79,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -88,7 +88,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline UpdateSSHPublicKeyRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -97,7 +97,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline UpdateSSHPublicKeyRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -106,7 +106,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline UpdateSSHPublicKeyRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
@@ -162,37 +162,37 @@ namespace Model
 
 
     /**
-     * <p>The status to assign to the SSH public key. <code>Active</code> means the key
-     * can be used for authentication with an AWS CodeCommit repository.
-     * <code>Inactive</code> means the key cannot be used.</p>
+     * <p>The status to assign to the SSH public key. <code>Active</code> means that
+     * the key can be used for authentication with an AWS CodeCommit repository.
+     * <code>Inactive</code> means that the key cannot be used.</p>
      */
     inline const StatusType& GetStatus() const{ return m_status; }
 
     /**
-     * <p>The status to assign to the SSH public key. <code>Active</code> means the key
-     * can be used for authentication with an AWS CodeCommit repository.
-     * <code>Inactive</code> means the key cannot be used.</p>
+     * <p>The status to assign to the SSH public key. <code>Active</code> means that
+     * the key can be used for authentication with an AWS CodeCommit repository.
+     * <code>Inactive</code> means that the key cannot be used.</p>
      */
     inline void SetStatus(const StatusType& value) { m_statusHasBeenSet = true; m_status = value; }
 
     /**
-     * <p>The status to assign to the SSH public key. <code>Active</code> means the key
-     * can be used for authentication with an AWS CodeCommit repository.
-     * <code>Inactive</code> means the key cannot be used.</p>
+     * <p>The status to assign to the SSH public key. <code>Active</code> means that
+     * the key can be used for authentication with an AWS CodeCommit repository.
+     * <code>Inactive</code> means that the key cannot be used.</p>
      */
     inline void SetStatus(StatusType&& value) { m_statusHasBeenSet = true; m_status = std::move(value); }
 
     /**
-     * <p>The status to assign to the SSH public key. <code>Active</code> means the key
-     * can be used for authentication with an AWS CodeCommit repository.
-     * <code>Inactive</code> means the key cannot be used.</p>
+     * <p>The status to assign to the SSH public key. <code>Active</code> means that
+     * the key can be used for authentication with an AWS CodeCommit repository.
+     * <code>Inactive</code> means that the key cannot be used.</p>
      */
     inline UpdateSSHPublicKeyRequest& WithStatus(const StatusType& value) { SetStatus(value); return *this;}
 
     /**
-     * <p>The status to assign to the SSH public key. <code>Active</code> means the key
-     * can be used for authentication with an AWS CodeCommit repository.
-     * <code>Inactive</code> means the key cannot be used.</p>
+     * <p>The status to assign to the SSH public key. <code>Active</code> means that
+     * the key can be used for authentication with an AWS CodeCommit repository.
+     * <code>Inactive</code> means that the key cannot be used.</p>
      */
     inline UpdateSSHPublicKeyRequest& WithStatus(StatusType&& value) { SetStatus(std::move(value)); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateServerCertificateRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateServerCertificateRequest.h
index 66c5a2eff94..10cab58aa04 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateServerCertificateRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateServerCertificateRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetServerCertificateName() const{ return m_serverCertificateName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetServerCertificateName(const Aws::String& value) { m_serverCertificateNameHasBeenSet = true; m_serverCertificateName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetServerCertificateName(Aws::String&& value) { m_serverCertificateNameHasBeenSet = true; m_serverCertificateName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetServerCertificateName(const char* value) { m_serverCertificateNameHasBeenSet = true; m_serverCertificateName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline UpdateServerCertificateRequest& WithServerCertificateName(const Aws::String& value) { SetServerCertificateName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline UpdateServerCertificateRequest& WithServerCertificateName(Aws::String&& value) { SetServerCertificateName(std::move(value)); return *this;}
 
@@ -105,85 +105,85 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline UpdateServerCertificateRequest& WithServerCertificateName(const char* value) { SetServerCertificateName(value); return *this;}
 
 
     /**
      * <p>The new path for the server certificate. Include this only if you are
-     * updating the server certificate's path.</p> <p>This paramater allows (per its <a
+     * updating the server certificate's path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline const Aws::String& GetNewPath() const{ return m_newPath; }
 
     /**
      * <p>The new path for the server certificate. Include this only if you are
-     * updating the server certificate's path.</p> <p>This paramater allows (per its <a
+     * updating the server certificate's path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline void SetNewPath(const Aws::String& value) { m_newPathHasBeenSet = true; m_newPath = value; }
 
     /**
      * <p>The new path for the server certificate. Include this only if you are
-     * updating the server certificate's path.</p> <p>This paramater allows (per its <a
+     * updating the server certificate's path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline void SetNewPath(Aws::String&& value) { m_newPathHasBeenSet = true; m_newPath = std::move(value); }
 
     /**
      * <p>The new path for the server certificate. Include this only if you are
-     * updating the server certificate's path.</p> <p>This paramater allows (per its <a
+     * updating the server certificate's path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline void SetNewPath(const char* value) { m_newPathHasBeenSet = true; m_newPath.assign(value); }
 
     /**
      * <p>The new path for the server certificate. Include this only if you are
-     * updating the server certificate's path.</p> <p>This paramater allows (per its <a
+     * updating the server certificate's path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline UpdateServerCertificateRequest& WithNewPath(const Aws::String& value) { SetNewPath(value); return *this;}
 
     /**
      * <p>The new path for the server certificate. Include this only if you are
-     * updating the server certificate's path.</p> <p>This paramater allows (per its <a
+     * updating the server certificate's path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline UpdateServerCertificateRequest& WithNewPath(Aws::String&& value) { SetNewPath(std::move(value)); return *this;}
 
     /**
      * <p>The new path for the server certificate. Include this only if you are
-     * updating the server certificate's path.</p> <p>This paramater allows (per its <a
+     * updating the server certificate's path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline UpdateServerCertificateRequest& WithNewPath(const char* value) { SetNewPath(value); return *this;}
 
@@ -194,7 +194,7 @@ namespace Model
      * contain any spaces.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetNewServerCertificateName() const{ return m_newServerCertificateName; }
 
@@ -204,7 +204,7 @@ namespace Model
      * contain any spaces.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetNewServerCertificateName(const Aws::String& value) { m_newServerCertificateNameHasBeenSet = true; m_newServerCertificateName = value; }
 
@@ -214,7 +214,7 @@ namespace Model
      * contain any spaces.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetNewServerCertificateName(Aws::String&& value) { m_newServerCertificateNameHasBeenSet = true; m_newServerCertificateName = std::move(value); }
 
@@ -224,7 +224,7 @@ namespace Model
      * contain any spaces.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetNewServerCertificateName(const char* value) { m_newServerCertificateNameHasBeenSet = true; m_newServerCertificateName.assign(value); }
 
@@ -234,7 +234,7 @@ namespace Model
      * contain any spaces.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline UpdateServerCertificateRequest& WithNewServerCertificateName(const Aws::String& value) { SetNewServerCertificateName(value); return *this;}
 
@@ -244,7 +244,7 @@ namespace Model
      * contain any spaces.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline UpdateServerCertificateRequest& WithNewServerCertificateName(Aws::String&& value) { SetNewServerCertificateName(std::move(value)); return *this;}
 
@@ -254,7 +254,7 @@ namespace Model
      * contain any spaces.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline UpdateServerCertificateRequest& WithNewServerCertificateName(const char* value) { SetNewServerCertificateName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateServiceSpecificCredentialRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateServiceSpecificCredentialRequest.h
index e51bd34113c..be7dfd4fad6 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateServiceSpecificCredentialRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateServiceSpecificCredentialRequest.h
@@ -53,7 +53,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -63,7 +63,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -73,7 +73,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -83,7 +83,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -93,7 +93,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline UpdateServiceSpecificCredentialRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -103,7 +103,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline UpdateServiceSpecificCredentialRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -113,7 +113,7 @@ namespace Model
      * credentials are used to call the operation.</p> <p>This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of upper and lowercase alphanumeric characters with no
-     * spaces. You can also include any of the following characters: =,.@-</p>
+     * spaces. You can also include any of the following characters: _+=,.@-</p>
      */
     inline UpdateServiceSpecificCredentialRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateSigningCertificateRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateSigningCertificateRequest.h
index 8721a6eebc3..ed1b09f64ae 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateSigningCertificateRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateSigningCertificateRequest.h
@@ -52,7 +52,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -61,7 +61,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -70,7 +70,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -79,7 +79,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -88,7 +88,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline UpdateSigningCertificateRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -97,7 +97,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline UpdateSigningCertificateRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -106,7 +106,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline UpdateSigningCertificateRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
@@ -170,36 +170,36 @@ namespace Model
 
     /**
      * <p> The status you want to assign to the certificate. <code>Active</code> means
-     * the certificate can be used for API calls to AWS, while <code>Inactive</code>
-     * means the certificate cannot be used.</p>
+     * that the certificate can be used for API calls to AWS <code>Inactive</code>
+     * means that the certificate cannot be used.</p>
      */
     inline const StatusType& GetStatus() const{ return m_status; }
 
     /**
      * <p> The status you want to assign to the certificate. <code>Active</code> means
-     * the certificate can be used for API calls to AWS, while <code>Inactive</code>
-     * means the certificate cannot be used.</p>
+     * that the certificate can be used for API calls to AWS <code>Inactive</code>
+     * means that the certificate cannot be used.</p>
      */
     inline void SetStatus(const StatusType& value) { m_statusHasBeenSet = true; m_status = value; }
 
     /**
      * <p> The status you want to assign to the certificate. <code>Active</code> means
-     * the certificate can be used for API calls to AWS, while <code>Inactive</code>
-     * means the certificate cannot be used.</p>
+     * that the certificate can be used for API calls to AWS <code>Inactive</code>
+     * means that the certificate cannot be used.</p>
      */
     inline void SetStatus(StatusType&& value) { m_statusHasBeenSet = true; m_status = std::move(value); }
 
     /**
      * <p> The status you want to assign to the certificate. <code>Active</code> means
-     * the certificate can be used for API calls to AWS, while <code>Inactive</code>
-     * means the certificate cannot be used.</p>
+     * that the certificate can be used for API calls to AWS <code>Inactive</code>
+     * means that the certificate cannot be used.</p>
      */
     inline UpdateSigningCertificateRequest& WithStatus(const StatusType& value) { SetStatus(value); return *this;}
 
     /**
      * <p> The status you want to assign to the certificate. <code>Active</code> means
-     * the certificate can be used for API calls to AWS, while <code>Inactive</code>
-     * means the certificate cannot be used.</p>
+     * that the certificate can be used for API calls to AWS <code>Inactive</code>
+     * means that the certificate cannot be used.</p>
      */
     inline UpdateSigningCertificateRequest& WithStatus(StatusType&& value) { SetStatus(std::move(value)); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateUserRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateUserRequest.h
index 87045cb8df3..f9e178449ee 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/UpdateUserRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/UpdateUserRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * the original user name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * the original user name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * the original user name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * the original user name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * the original user name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline UpdateUserRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * the original user name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline UpdateUserRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -105,85 +105,85 @@ namespace Model
      * the original user name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline UpdateUserRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
 
     /**
      * <p>New path for the IAM user. Include this parameter only if you're changing the
-     * user's path.</p> <p>This paramater allows (per its <a
+     * user's path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline const Aws::String& GetNewPath() const{ return m_newPath; }
 
     /**
      * <p>New path for the IAM user. Include this parameter only if you're changing the
-     * user's path.</p> <p>This paramater allows (per its <a
+     * user's path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline void SetNewPath(const Aws::String& value) { m_newPathHasBeenSet = true; m_newPath = value; }
 
     /**
      * <p>New path for the IAM user. Include this parameter only if you're changing the
-     * user's path.</p> <p>This paramater allows (per its <a
+     * user's path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline void SetNewPath(Aws::String&& value) { m_newPathHasBeenSet = true; m_newPath = std::move(value); }
 
     /**
      * <p>New path for the IAM user. Include this parameter only if you're changing the
-     * user's path.</p> <p>This paramater allows (per its <a
+     * user's path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline void SetNewPath(const char* value) { m_newPathHasBeenSet = true; m_newPath.assign(value); }
 
     /**
      * <p>New path for the IAM user. Include this parameter only if you're changing the
-     * user's path.</p> <p>This paramater allows (per its <a
+     * user's path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline UpdateUserRequest& WithNewPath(const Aws::String& value) { SetNewPath(value); return *this;}
 
     /**
      * <p>New path for the IAM user. Include this parameter only if you're changing the
-     * user's path.</p> <p>This paramater allows (per its <a
+     * user's path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline UpdateUserRequest& WithNewPath(Aws::String&& value) { SetNewPath(std::move(value)); return *this;}
 
     /**
      * <p>New path for the IAM user. Include this parameter only if you're changing the
-     * user's path.</p> <p>This paramater allows (per its <a
+     * user's path.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of either a forward slash (/) by itself or a string that must begin
-     * and end with forward slashes, containing any ASCII character from the ! (\u0021)
-     * thru the DEL character (\u007F), including most punctuation characters, digits,
-     * and upper and lowercased letters.</p>
+     * and end with forward slashes. In addition, it can contain any ASCII character
+     * from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p>
      */
     inline UpdateUserRequest& WithNewPath(const char* value) { SetNewPath(value); return *this;}
 
@@ -193,7 +193,7 @@ namespace Model
      * user's name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetNewUserName() const{ return m_newUserName; }
 
@@ -202,7 +202,7 @@ namespace Model
      * user's name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetNewUserName(const Aws::String& value) { m_newUserNameHasBeenSet = true; m_newUserName = value; }
 
@@ -211,7 +211,7 @@ namespace Model
      * user's name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetNewUserName(Aws::String&& value) { m_newUserNameHasBeenSet = true; m_newUserName = std::move(value); }
 
@@ -220,7 +220,7 @@ namespace Model
      * user's name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline void SetNewUserName(const char* value) { m_newUserNameHasBeenSet = true; m_newUserName.assign(value); }
 
@@ -229,7 +229,7 @@ namespace Model
      * user's name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline UpdateUserRequest& WithNewUserName(const Aws::String& value) { SetNewUserName(value); return *this;}
 
@@ -238,7 +238,7 @@ namespace Model
      * user's name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline UpdateUserRequest& WithNewUserName(Aws::String&& value) { SetNewUserName(std::move(value)); return *this;}
 
@@ -247,7 +247,7 @@ namespace Model
      * user's name.</p> <p>This parameter allows (per its <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of characters
      * consisting of upper and lowercase alphanumeric characters with no spaces. You
-     * can also include any of the following characters: =,.@-</p>
+     * can also include any of the following characters: _+=,.@-</p>
      */
     inline UpdateUserRequest& WithNewUserName(const char* value) { SetNewUserName(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/UploadSSHPublicKeyRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/UploadSSHPublicKeyRequest.h
index bb127cb9f32..f8987ebdc23 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/UploadSSHPublicKeyRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/UploadSSHPublicKeyRequest.h
@@ -51,7 +51,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -60,7 +60,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -69,7 +69,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -78,7 +78,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -87,7 +87,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline UploadSSHPublicKeyRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -96,7 +96,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline UploadSSHPublicKeyRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -105,7 +105,7 @@ namespace Model
      * parameter allows (per its <a href="http://wikipedia.org/wiki/regex">regex
      * pattern</a>) a string of characters consisting of upper and lowercase
      * alphanumeric characters with no spaces. You can also include any of the
-     * following characters: =,.@-</p>
+     * following characters: _+=,.@-</p>
      */
     inline UploadSSHPublicKeyRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
@@ -113,84 +113,84 @@ namespace Model
     /**
      * <p>The SSH public key. The public key must be encoded in ssh-rsa format or PEM
      * format.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a>
-     * used to validate this parameter is a string of characters consisting of any
-     * printable ASCII character ranging from the space character (\u0020) through end
-     * of the ASCII character range as well as the printable characters in the Basic
-     * Latin and Latin-1 Supplement character set (through \u00FF). It also includes
-     * the special characters tab (\u0009), line feed (\u000A), and carriage return
-     * (\u000D).</p>
+     * used to validate this parameter is a string of characters consisting of the
+     * following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space
+     * character (\u0020) through the end of the ASCII character range</p> </li> <li>
+     * <p>The printable characters in the Basic Latin and Latin-1 Supplement character
+     * set (through \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline const Aws::String& GetSSHPublicKeyBody() const{ return m_sSHPublicKeyBody; }
 
     /**
      * <p>The SSH public key. The public key must be encoded in ssh-rsa format or PEM
      * format.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a>
-     * used to validate this parameter is a string of characters consisting of any
-     * printable ASCII character ranging from the space character (\u0020) through end
-     * of the ASCII character range as well as the printable characters in the Basic
-     * Latin and Latin-1 Supplement character set (through \u00FF). It also includes
-     * the special characters tab (\u0009), line feed (\u000A), and carriage return
-     * (\u000D).</p>
+     * used to validate this parameter is a string of characters consisting of the
+     * following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space
+     * character (\u0020) through the end of the ASCII character range</p> </li> <li>
+     * <p>The printable characters in the Basic Latin and Latin-1 Supplement character
+     * set (through \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetSSHPublicKeyBody(const Aws::String& value) { m_sSHPublicKeyBodyHasBeenSet = true; m_sSHPublicKeyBody = value; }
 
     /**
      * <p>The SSH public key. The public key must be encoded in ssh-rsa format or PEM
      * format.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a>
-     * used to validate this parameter is a string of characters consisting of any
-     * printable ASCII character ranging from the space character (\u0020) through end
-     * of the ASCII character range as well as the printable characters in the Basic
-     * Latin and Latin-1 Supplement character set (through \u00FF). It also includes
-     * the special characters tab (\u0009), line feed (\u000A), and carriage return
-     * (\u000D).</p>
+     * used to validate this parameter is a string of characters consisting of the
+     * following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space
+     * character (\u0020) through the end of the ASCII character range</p> </li> <li>
+     * <p>The printable characters in the Basic Latin and Latin-1 Supplement character
+     * set (through \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetSSHPublicKeyBody(Aws::String&& value) { m_sSHPublicKeyBodyHasBeenSet = true; m_sSHPublicKeyBody = std::move(value); }
 
     /**
      * <p>The SSH public key. The public key must be encoded in ssh-rsa format or PEM
      * format.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a>
-     * used to validate this parameter is a string of characters consisting of any
-     * printable ASCII character ranging from the space character (\u0020) through end
-     * of the ASCII character range as well as the printable characters in the Basic
-     * Latin and Latin-1 Supplement character set (through \u00FF). It also includes
-     * the special characters tab (\u0009), line feed (\u000A), and carriage return
-     * (\u000D).</p>
+     * used to validate this parameter is a string of characters consisting of the
+     * following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space
+     * character (\u0020) through the end of the ASCII character range</p> </li> <li>
+     * <p>The printable characters in the Basic Latin and Latin-1 Supplement character
+     * set (through \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetSSHPublicKeyBody(const char* value) { m_sSHPublicKeyBodyHasBeenSet = true; m_sSHPublicKeyBody.assign(value); }
 
     /**
      * <p>The SSH public key. The public key must be encoded in ssh-rsa format or PEM
      * format.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a>
-     * used to validate this parameter is a string of characters consisting of any
-     * printable ASCII character ranging from the space character (\u0020) through end
-     * of the ASCII character range as well as the printable characters in the Basic
-     * Latin and Latin-1 Supplement character set (through \u00FF). It also includes
-     * the special characters tab (\u0009), line feed (\u000A), and carriage return
-     * (\u000D).</p>
+     * used to validate this parameter is a string of characters consisting of the
+     * following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space
+     * character (\u0020) through the end of the ASCII character range</p> </li> <li>
+     * <p>The printable characters in the Basic Latin and Latin-1 Supplement character
+     * set (through \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline UploadSSHPublicKeyRequest& WithSSHPublicKeyBody(const Aws::String& value) { SetSSHPublicKeyBody(value); return *this;}
 
     /**
      * <p>The SSH public key. The public key must be encoded in ssh-rsa format or PEM
      * format.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a>
-     * used to validate this parameter is a string of characters consisting of any
-     * printable ASCII character ranging from the space character (\u0020) through end
-     * of the ASCII character range as well as the printable characters in the Basic
-     * Latin and Latin-1 Supplement character set (through \u00FF). It also includes
-     * the special characters tab (\u0009), line feed (\u000A), and carriage return
-     * (\u000D).</p>
+     * used to validate this parameter is a string of characters consisting of the
+     * following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space
+     * character (\u0020) through the end of the ASCII character range</p> </li> <li>
+     * <p>The printable characters in the Basic Latin and Latin-1 Supplement character
+     * set (through \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline UploadSSHPublicKeyRequest& WithSSHPublicKeyBody(Aws::String&& value) { SetSSHPublicKeyBody(std::move(value)); return *this;}
 
     /**
      * <p>The SSH public key. The public key must be encoded in ssh-rsa format or PEM
      * format.</p> <p>The <a href="http://wikipedia.org/wiki/regex">regex pattern</a>
-     * used to validate this parameter is a string of characters consisting of any
-     * printable ASCII character ranging from the space character (\u0020) through end
-     * of the ASCII character range as well as the printable characters in the Basic
-     * Latin and Latin-1 Supplement character set (through \u00FF). It also includes
-     * the special characters tab (\u0009), line feed (\u000A), and carriage return
-     * (\u000D).</p>
+     * used to validate this parameter is a string of characters consisting of the
+     * following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space
+     * character (\u0020) through the end of the ASCII character range</p> </li> <li>
+     * <p>The printable characters in the Basic Latin and Latin-1 Supplement character
+     * set (through \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line
+     * feed (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline UploadSSHPublicKeyRequest& WithSSHPublicKeyBody(const char* value) { SetSSHPublicKeyBody(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/UploadServerCertificateRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/UploadServerCertificateRequest.h
index a2b7f0a3c67..d457bfb92fa 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/UploadServerCertificateRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/UploadServerCertificateRequest.h
@@ -50,16 +50,16 @@ namespace Model
      * <p>The path for the server certificate. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/). This paramater allows (per
+     * If it is not included, it defaults to a slash (/). This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of either a forward slash (/) by itself or a string that
-     * must begin and end with forward slashes, containing any ASCII character from the
-     * ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p> <note> <p> If you are
-     * uploading a server certificate specifically for use with Amazon CloudFront
-     * distributions, you must specify a path using the <code>--path</code> option. The
-     * path must begin with <code>/cloudfront</code> and must include a trailing slash
-     * (for example, <code>/cloudfront/test/</code>).</p> </note>
+     * must begin and end with forward slashes. In addition, it can contain any ASCII
+     * character from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p> <note> <p>
+     * If you are uploading a server certificate specifically for use with Amazon
+     * CloudFront distributions, you must specify a path using the <code>path</code>
+     * parameter. The path must begin with <code>/cloudfront</code> and must include a
+     * trailing slash (for example, <code>/cloudfront/test/</code>).</p> </note>
      */
     inline const Aws::String& GetPath() const{ return m_path; }
 
@@ -67,16 +67,16 @@ namespace Model
      * <p>The path for the server certificate. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/). This paramater allows (per
+     * If it is not included, it defaults to a slash (/). This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of either a forward slash (/) by itself or a string that
-     * must begin and end with forward slashes, containing any ASCII character from the
-     * ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p> <note> <p> If you are
-     * uploading a server certificate specifically for use with Amazon CloudFront
-     * distributions, you must specify a path using the <code>--path</code> option. The
-     * path must begin with <code>/cloudfront</code> and must include a trailing slash
-     * (for example, <code>/cloudfront/test/</code>).</p> </note>
+     * must begin and end with forward slashes. In addition, it can contain any ASCII
+     * character from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p> <note> <p>
+     * If you are uploading a server certificate specifically for use with Amazon
+     * CloudFront distributions, you must specify a path using the <code>path</code>
+     * parameter. The path must begin with <code>/cloudfront</code> and must include a
+     * trailing slash (for example, <code>/cloudfront/test/</code>).</p> </note>
      */
     inline void SetPath(const Aws::String& value) { m_pathHasBeenSet = true; m_path = value; }
 
@@ -84,16 +84,16 @@ namespace Model
      * <p>The path for the server certificate. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/). This paramater allows (per
+     * If it is not included, it defaults to a slash (/). This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of either a forward slash (/) by itself or a string that
-     * must begin and end with forward slashes, containing any ASCII character from the
-     * ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p> <note> <p> If you are
-     * uploading a server certificate specifically for use with Amazon CloudFront
-     * distributions, you must specify a path using the <code>--path</code> option. The
-     * path must begin with <code>/cloudfront</code> and must include a trailing slash
-     * (for example, <code>/cloudfront/test/</code>).</p> </note>
+     * must begin and end with forward slashes. In addition, it can contain any ASCII
+     * character from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p> <note> <p>
+     * If you are uploading a server certificate specifically for use with Amazon
+     * CloudFront distributions, you must specify a path using the <code>path</code>
+     * parameter. The path must begin with <code>/cloudfront</code> and must include a
+     * trailing slash (for example, <code>/cloudfront/test/</code>).</p> </note>
      */
     inline void SetPath(Aws::String&& value) { m_pathHasBeenSet = true; m_path = std::move(value); }
 
@@ -101,16 +101,16 @@ namespace Model
      * <p>The path for the server certificate. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/). This paramater allows (per
+     * If it is not included, it defaults to a slash (/). This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of either a forward slash (/) by itself or a string that
-     * must begin and end with forward slashes, containing any ASCII character from the
-     * ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p> <note> <p> If you are
-     * uploading a server certificate specifically for use with Amazon CloudFront
-     * distributions, you must specify a path using the <code>--path</code> option. The
-     * path must begin with <code>/cloudfront</code> and must include a trailing slash
-     * (for example, <code>/cloudfront/test/</code>).</p> </note>
+     * must begin and end with forward slashes. In addition, it can contain any ASCII
+     * character from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p> <note> <p>
+     * If you are uploading a server certificate specifically for use with Amazon
+     * CloudFront distributions, you must specify a path using the <code>path</code>
+     * parameter. The path must begin with <code>/cloudfront</code> and must include a
+     * trailing slash (for example, <code>/cloudfront/test/</code>).</p> </note>
      */
     inline void SetPath(const char* value) { m_pathHasBeenSet = true; m_path.assign(value); }
 
@@ -118,16 +118,16 @@ namespace Model
      * <p>The path for the server certificate. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/). This paramater allows (per
+     * If it is not included, it defaults to a slash (/). This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of either a forward slash (/) by itself or a string that
-     * must begin and end with forward slashes, containing any ASCII character from the
-     * ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p> <note> <p> If you are
-     * uploading a server certificate specifically for use with Amazon CloudFront
-     * distributions, you must specify a path using the <code>--path</code> option. The
-     * path must begin with <code>/cloudfront</code> and must include a trailing slash
-     * (for example, <code>/cloudfront/test/</code>).</p> </note>
+     * must begin and end with forward slashes. In addition, it can contain any ASCII
+     * character from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p> <note> <p>
+     * If you are uploading a server certificate specifically for use with Amazon
+     * CloudFront distributions, you must specify a path using the <code>path</code>
+     * parameter. The path must begin with <code>/cloudfront</code> and must include a
+     * trailing slash (for example, <code>/cloudfront/test/</code>).</p> </note>
      */
     inline UploadServerCertificateRequest& WithPath(const Aws::String& value) { SetPath(value); return *this;}
 
@@ -135,16 +135,16 @@ namespace Model
      * <p>The path for the server certificate. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/). This paramater allows (per
+     * If it is not included, it defaults to a slash (/). This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of either a forward slash (/) by itself or a string that
-     * must begin and end with forward slashes, containing any ASCII character from the
-     * ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p> <note> <p> If you are
-     * uploading a server certificate specifically for use with Amazon CloudFront
-     * distributions, you must specify a path using the <code>--path</code> option. The
-     * path must begin with <code>/cloudfront</code> and must include a trailing slash
-     * (for example, <code>/cloudfront/test/</code>).</p> </note>
+     * must begin and end with forward slashes. In addition, it can contain any ASCII
+     * character from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p> <note> <p>
+     * If you are uploading a server certificate specifically for use with Amazon
+     * CloudFront distributions, you must specify a path using the <code>path</code>
+     * parameter. The path must begin with <code>/cloudfront</code> and must include a
+     * trailing slash (for example, <code>/cloudfront/test/</code>).</p> </note>
      */
     inline UploadServerCertificateRequest& WithPath(Aws::String&& value) { SetPath(std::move(value)); return *this;}
 
@@ -152,16 +152,16 @@ namespace Model
      * <p>The path for the server certificate. For more information about paths, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html">IAM
      * Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional.
-     * If it is not included, it defaults to a slash (/). This paramater allows (per
+     * If it is not included, it defaults to a slash (/). This parameter allows (per
      * its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a string of
      * characters consisting of either a forward slash (/) by itself or a string that
-     * must begin and end with forward slashes, containing any ASCII character from the
-     * ! (\u0021) thru the DEL character (\u007F), including most punctuation
-     * characters, digits, and upper and lowercased letters.</p> <note> <p> If you are
-     * uploading a server certificate specifically for use with Amazon CloudFront
-     * distributions, you must specify a path using the <code>--path</code> option. The
-     * path must begin with <code>/cloudfront</code> and must include a trailing slash
-     * (for example, <code>/cloudfront/test/</code>).</p> </note>
+     * must begin and end with forward slashes. In addition, it can contain any ASCII
+     * character from the ! (\u0021) through the DEL character (\u007F), including most
+     * punctuation characters, digits, and upper and lowercased letters.</p> <note> <p>
+     * If you are uploading a server certificate specifically for use with Amazon
+     * CloudFront distributions, you must specify a path using the <code>path</code>
+     * parameter. The path must begin with <code>/cloudfront</code> and must include a
+     * trailing slash (for example, <code>/cloudfront/test/</code>).</p> </note>
      */
     inline UploadServerCertificateRequest& WithPath(const char* value) { SetPath(value); return *this;}
 
@@ -171,7 +171,8 @@ namespace Model
      * The name of the certificate cannot contain any spaces.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline const Aws::String& GetServerCertificateName() const{ return m_serverCertificateName; }
 
@@ -180,7 +181,8 @@ namespace Model
      * The name of the certificate cannot contain any spaces.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetServerCertificateName(const Aws::String& value) { m_serverCertificateNameHasBeenSet = true; m_serverCertificateName = value; }
 
@@ -189,7 +191,8 @@ namespace Model
      * The name of the certificate cannot contain any spaces.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetServerCertificateName(Aws::String&& value) { m_serverCertificateNameHasBeenSet = true; m_serverCertificateName = std::move(value); }
 
@@ -198,7 +201,8 @@ namespace Model
      * The name of the certificate cannot contain any spaces.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetServerCertificateName(const char* value) { m_serverCertificateNameHasBeenSet = true; m_serverCertificateName.assign(value); }
 
@@ -207,7 +211,8 @@ namespace Model
      * The name of the certificate cannot contain any spaces.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline UploadServerCertificateRequest& WithServerCertificateName(const Aws::String& value) { SetServerCertificateName(value); return *this;}
 
@@ -216,7 +221,8 @@ namespace Model
      * The name of the certificate cannot contain any spaces.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline UploadServerCertificateRequest& WithServerCertificateName(Aws::String&& value) { SetServerCertificateName(std::move(value)); return *this;}
 
@@ -225,7 +231,8 @@ namespace Model
      * The name of the certificate cannot contain any spaces.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline UploadServerCertificateRequest& WithServerCertificateName(const char* value) { SetServerCertificateName(value); return *this;}
 
@@ -233,77 +240,84 @@ namespace Model
     /**
      * <p>The contents of the public key certificate in PEM-encoded format.</p> <p>The
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate
-     * this parameter is a string of characters consisting of any printable ASCII
-     * character ranging from the space character (\u0020) through end of the ASCII
-     * character range as well as the printable characters in the Basic Latin and
-     * Latin-1 Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * this parameter is a string of characters consisting of the following:</p> <ul>
+     * <li> <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline const Aws::String& GetCertificateBody() const{ return m_certificateBody; }
 
     /**
      * <p>The contents of the public key certificate in PEM-encoded format.</p> <p>The
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate
-     * this parameter is a string of characters consisting of any printable ASCII
-     * character ranging from the space character (\u0020) through end of the ASCII
-     * character range as well as the printable characters in the Basic Latin and
-     * Latin-1 Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * this parameter is a string of characters consisting of the following:</p> <ul>
+     * <li> <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetCertificateBody(const Aws::String& value) { m_certificateBodyHasBeenSet = true; m_certificateBody = value; }
 
     /**
      * <p>The contents of the public key certificate in PEM-encoded format.</p> <p>The
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate
-     * this parameter is a string of characters consisting of any printable ASCII
-     * character ranging from the space character (\u0020) through end of the ASCII
-     * character range as well as the printable characters in the Basic Latin and
-     * Latin-1 Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * this parameter is a string of characters consisting of the following:</p> <ul>
+     * <li> <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetCertificateBody(Aws::String&& value) { m_certificateBodyHasBeenSet = true; m_certificateBody = std::move(value); }
 
     /**
      * <p>The contents of the public key certificate in PEM-encoded format.</p> <p>The
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate
-     * this parameter is a string of characters consisting of any printable ASCII
-     * character ranging from the space character (\u0020) through end of the ASCII
-     * character range as well as the printable characters in the Basic Latin and
-     * Latin-1 Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * this parameter is a string of characters consisting of the following:</p> <ul>
+     * <li> <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetCertificateBody(const char* value) { m_certificateBodyHasBeenSet = true; m_certificateBody.assign(value); }
 
     /**
      * <p>The contents of the public key certificate in PEM-encoded format.</p> <p>The
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate
-     * this parameter is a string of characters consisting of any printable ASCII
-     * character ranging from the space character (\u0020) through end of the ASCII
-     * character range as well as the printable characters in the Basic Latin and
-     * Latin-1 Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * this parameter is a string of characters consisting of the following:</p> <ul>
+     * <li> <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline UploadServerCertificateRequest& WithCertificateBody(const Aws::String& value) { SetCertificateBody(value); return *this;}
 
     /**
      * <p>The contents of the public key certificate in PEM-encoded format.</p> <p>The
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate
-     * this parameter is a string of characters consisting of any printable ASCII
-     * character ranging from the space character (\u0020) through end of the ASCII
-     * character range as well as the printable characters in the Basic Latin and
-     * Latin-1 Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * this parameter is a string of characters consisting of the following:</p> <ul>
+     * <li> <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline UploadServerCertificateRequest& WithCertificateBody(Aws::String&& value) { SetCertificateBody(std::move(value)); return *this;}
 
     /**
      * <p>The contents of the public key certificate in PEM-encoded format.</p> <p>The
      * <a href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate
-     * this parameter is a string of characters consisting of any printable ASCII
-     * character ranging from the space character (\u0020) through end of the ASCII
-     * character range as well as the printable characters in the Basic Latin and
-     * Latin-1 Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * this parameter is a string of characters consisting of the following:</p> <ul>
+     * <li> <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline UploadServerCertificateRequest& WithCertificateBody(const char* value) { SetCertificateBody(value); return *this;}
 
@@ -311,77 +325,84 @@ namespace Model
     /**
      * <p>The contents of the private key in PEM-encoded format.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline const Aws::String& GetPrivateKey() const{ return m_privateKey; }
 
     /**
      * <p>The contents of the private key in PEM-encoded format.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPrivateKey(const Aws::String& value) { m_privateKeyHasBeenSet = true; m_privateKey = value; }
 
     /**
      * <p>The contents of the private key in PEM-encoded format.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPrivateKey(Aws::String&& value) { m_privateKeyHasBeenSet = true; m_privateKey = std::move(value); }
 
     /**
      * <p>The contents of the private key in PEM-encoded format.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetPrivateKey(const char* value) { m_privateKeyHasBeenSet = true; m_privateKey.assign(value); }
 
     /**
      * <p>The contents of the private key in PEM-encoded format.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline UploadServerCertificateRequest& WithPrivateKey(const Aws::String& value) { SetPrivateKey(value); return *this;}
 
     /**
      * <p>The contents of the private key in PEM-encoded format.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline UploadServerCertificateRequest& WithPrivateKey(Aws::String&& value) { SetPrivateKey(std::move(value)); return *this;}
 
     /**
      * <p>The contents of the private key in PEM-encoded format.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline UploadServerCertificateRequest& WithPrivateKey(const char* value) { SetPrivateKey(value); return *this;}
 
@@ -390,11 +411,12 @@ namespace Model
      * <p>The contents of the certificate chain. This is typically a concatenation of
      * the PEM-encoded public key certificates of the chain.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline const Aws::String& GetCertificateChain() const{ return m_certificateChain; }
 
@@ -402,11 +424,12 @@ namespace Model
      * <p>The contents of the certificate chain. This is typically a concatenation of
      * the PEM-encoded public key certificates of the chain.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetCertificateChain(const Aws::String& value) { m_certificateChainHasBeenSet = true; m_certificateChain = value; }
 
@@ -414,11 +437,12 @@ namespace Model
      * <p>The contents of the certificate chain. This is typically a concatenation of
      * the PEM-encoded public key certificates of the chain.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetCertificateChain(Aws::String&& value) { m_certificateChainHasBeenSet = true; m_certificateChain = std::move(value); }
 
@@ -426,11 +450,12 @@ namespace Model
      * <p>The contents of the certificate chain. This is typically a concatenation of
      * the PEM-encoded public key certificates of the chain.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetCertificateChain(const char* value) { m_certificateChainHasBeenSet = true; m_certificateChain.assign(value); }
 
@@ -438,11 +463,12 @@ namespace Model
      * <p>The contents of the certificate chain. This is typically a concatenation of
      * the PEM-encoded public key certificates of the chain.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline UploadServerCertificateRequest& WithCertificateChain(const Aws::String& value) { SetCertificateChain(value); return *this;}
 
@@ -450,11 +476,12 @@ namespace Model
      * <p>The contents of the certificate chain. This is typically a concatenation of
      * the PEM-encoded public key certificates of the chain.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline UploadServerCertificateRequest& WithCertificateChain(Aws::String&& value) { SetCertificateChain(std::move(value)); return *this;}
 
@@ -462,11 +489,12 @@ namespace Model
      * <p>The contents of the certificate chain. This is typically a concatenation of
      * the PEM-encoded public key certificates of the chain.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline UploadServerCertificateRequest& WithCertificateChain(const char* value) { SetCertificateChain(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/UploadSigningCertificateRequest.h b/aws-cpp-sdk-iam/include/aws/iam/model/UploadSigningCertificateRequest.h
index 53287bf3db9..6ef1da5b423 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/UploadSigningCertificateRequest.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/UploadSigningCertificateRequest.h
@@ -50,7 +50,8 @@ namespace Model
      * <p>The name of the user the signing certificate is for.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline const Aws::String& GetUserName() const{ return m_userName; }
 
@@ -58,7 +59,8 @@ namespace Model
      * <p>The name of the user the signing certificate is for.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetUserName(const Aws::String& value) { m_userNameHasBeenSet = true; m_userName = value; }
 
@@ -66,7 +68,8 @@ namespace Model
      * <p>The name of the user the signing certificate is for.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetUserName(Aws::String&& value) { m_userNameHasBeenSet = true; m_userName = std::move(value); }
 
@@ -74,7 +77,8 @@ namespace Model
      * <p>The name of the user the signing certificate is for.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline void SetUserName(const char* value) { m_userNameHasBeenSet = true; m_userName.assign(value); }
 
@@ -82,7 +86,8 @@ namespace Model
      * <p>The name of the user the signing certificate is for.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline UploadSigningCertificateRequest& WithUserName(const Aws::String& value) { SetUserName(value); return *this;}
 
@@ -90,7 +95,8 @@ namespace Model
      * <p>The name of the user the signing certificate is for.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline UploadSigningCertificateRequest& WithUserName(Aws::String&& value) { SetUserName(std::move(value)); return *this;}
 
@@ -98,7 +104,8 @@ namespace Model
      * <p>The name of the user the signing certificate is for.</p> <p>This parameter
      * allows (per its <a href="http://wikipedia.org/wiki/regex">regex pattern</a>) a
      * string of characters consisting of upper and lowercase alphanumeric characters
-     * with no spaces. You can also include any of the following characters: =,.@-</p>
+     * with no spaces. You can also include any of the following characters:
+     * _+=,.@-</p>
      */
     inline UploadSigningCertificateRequest& WithUserName(const char* value) { SetUserName(value); return *this;}
 
@@ -106,77 +113,84 @@ namespace Model
     /**
      * <p>The contents of the signing certificate.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline const Aws::String& GetCertificateBody() const{ return m_certificateBody; }
 
     /**
      * <p>The contents of the signing certificate.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetCertificateBody(const Aws::String& value) { m_certificateBodyHasBeenSet = true; m_certificateBody = value; }
 
     /**
      * <p>The contents of the signing certificate.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetCertificateBody(Aws::String&& value) { m_certificateBodyHasBeenSet = true; m_certificateBody = std::move(value); }
 
     /**
      * <p>The contents of the signing certificate.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline void SetCertificateBody(const char* value) { m_certificateBodyHasBeenSet = true; m_certificateBody.assign(value); }
 
     /**
      * <p>The contents of the signing certificate.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline UploadSigningCertificateRequest& WithCertificateBody(const Aws::String& value) { SetCertificateBody(value); return *this;}
 
     /**
      * <p>The contents of the signing certificate.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline UploadSigningCertificateRequest& WithCertificateBody(Aws::String&& value) { SetCertificateBody(std::move(value)); return *this;}
 
     /**
      * <p>The contents of the signing certificate.</p> <p>The <a
      * href="http://wikipedia.org/wiki/regex">regex pattern</a> used to validate this
-     * parameter is a string of characters consisting of any printable ASCII character
-     * ranging from the space character (\u0020) through end of the ASCII character
-     * range as well as the printable characters in the Basic Latin and Latin-1
-     * Supplement character set (through \u00FF). It also includes the special
-     * characters tab (\u0009), line feed (\u000A), and carriage return (\u000D).</p>
+     * parameter is a string of characters consisting of the following:</p> <ul> <li>
+     * <p>Any printable ASCII character ranging from the space character (\u0020)
+     * through the end of the ASCII character range</p> </li> <li> <p>The printable
+     * characters in the Basic Latin and Latin-1 Supplement character set (through
+     * \u00FF)</p> </li> <li> <p>The special characters tab (\u0009), line feed
+     * (\u000A), and carriage return (\u000D)</p> </li> </ul>
      */
     inline UploadSigningCertificateRequest& WithCertificateBody(const char* value) { SetCertificateBody(value); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/User.h b/aws-cpp-sdk-iam/include/aws/iam/model/User.h
index 1dd7a03c854..733f54cabb3 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/User.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/User.h
@@ -36,7 +36,7 @@ namespace Model
 
   /**
    * <p>Contains information about an IAM user entity.</p> <p>This data type is used
-   * as a response element in the following actions:</p> <ul> <li> <p>
+   * as a response element in the following operations:</p> <ul> <li> <p>
    * <a>CreateUser</a> </p> </li> <li> <p> <a>GetUser</a> </p> </li> <li> <p>
    * <a>ListUsers</a> </p> </li> </ul><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/User">AWS API
@@ -299,7 +299,7 @@ namespace Model
      * null does not mean that the user <i>never</i> had a password. Also, if the user
      * does not currently have a password, but had one in the past, then this field
      * contains the date and time the most recent password was used.</p> <p>This value
-     * is returned only in the <a>GetUser</a> and <a>ListUsers</a> actions. </p>
+     * is returned only in the <a>GetUser</a> and <a>ListUsers</a> operations. </p>
      */
     inline const Aws::Utils::DateTime& GetPasswordLastUsed() const{ return m_passwordLastUsed; }
 
@@ -318,7 +318,7 @@ namespace Model
      * null does not mean that the user <i>never</i> had a password. Also, if the user
      * does not currently have a password, but had one in the past, then this field
      * contains the date and time the most recent password was used.</p> <p>This value
-     * is returned only in the <a>GetUser</a> and <a>ListUsers</a> actions. </p>
+     * is returned only in the <a>GetUser</a> and <a>ListUsers</a> operations. </p>
      */
     inline void SetPasswordLastUsed(const Aws::Utils::DateTime& value) { m_passwordLastUsedHasBeenSet = true; m_passwordLastUsed = value; }
 
@@ -337,7 +337,7 @@ namespace Model
      * null does not mean that the user <i>never</i> had a password. Also, if the user
      * does not currently have a password, but had one in the past, then this field
      * contains the date and time the most recent password was used.</p> <p>This value
-     * is returned only in the <a>GetUser</a> and <a>ListUsers</a> actions. </p>
+     * is returned only in the <a>GetUser</a> and <a>ListUsers</a> operations. </p>
      */
     inline void SetPasswordLastUsed(Aws::Utils::DateTime&& value) { m_passwordLastUsedHasBeenSet = true; m_passwordLastUsed = std::move(value); }
 
@@ -356,7 +356,7 @@ namespace Model
      * null does not mean that the user <i>never</i> had a password. Also, if the user
      * does not currently have a password, but had one in the past, then this field
      * contains the date and time the most recent password was used.</p> <p>This value
-     * is returned only in the <a>GetUser</a> and <a>ListUsers</a> actions. </p>
+     * is returned only in the <a>GetUser</a> and <a>ListUsers</a> operations. </p>
      */
     inline User& WithPasswordLastUsed(const Aws::Utils::DateTime& value) { SetPasswordLastUsed(value); return *this;}
 
@@ -375,7 +375,7 @@ namespace Model
      * null does not mean that the user <i>never</i> had a password. Also, if the user
      * does not currently have a password, but had one in the past, then this field
      * contains the date and time the most recent password was used.</p> <p>This value
-     * is returned only in the <a>GetUser</a> and <a>ListUsers</a> actions. </p>
+     * is returned only in the <a>GetUser</a> and <a>ListUsers</a> operations. </p>
      */
     inline User& WithPasswordLastUsed(Aws::Utils::DateTime&& value) { SetPasswordLastUsed(std::move(value)); return *this;}
 
diff --git a/aws-cpp-sdk-iam/include/aws/iam/model/UserDetail.h b/aws-cpp-sdk-iam/include/aws/iam/model/UserDetail.h
index bf95a10e6e7..a15b607cb50 100644
--- a/aws-cpp-sdk-iam/include/aws/iam/model/UserDetail.h
+++ b/aws-cpp-sdk-iam/include/aws/iam/model/UserDetail.h
@@ -40,7 +40,7 @@ namespace Model
   /**
    * <p>Contains information about an IAM user, including all the user's policies and
    * all the IAM groups the user is in.</p> <p>This data type is used as a response
-   * element in the <a>GetAccountAuthorizationDetails</a> action.</p><p><h3>See
+   * element in the <a>GetAccountAuthorizationDetails</a> operation.</p><p><h3>See
    * Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/iam-2010-05-08/UserDetail">AWS API
    * Reference</a></p>
diff --git a/aws-cpp-sdk-iam/nuget/aws-cpp-sdk-iam.autopkg b/aws-cpp-sdk-iam/nuget/aws-cpp-sdk-iam.autopkg
index a9f38025b14..8f6c50af018 100644
--- a/aws-cpp-sdk-iam/nuget/aws-cpp-sdk-iam.autopkg
+++ b/aws-cpp-sdk-iam/nuget/aws-cpp-sdk-iam.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-IAM;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20100508.23;
+        version : 1.4.20100508.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Identity and Access Management);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-iam/source/IAMClient.cpp b/aws-cpp-sdk-iam/source/IAMClient.cpp
index 744bffc1a2d..c124722127e 100644
--- a/aws-cpp-sdk-iam/source/IAMClient.cpp
+++ b/aws-cpp-sdk-iam/source/IAMClient.cpp
@@ -139,6 +139,7 @@
 #include <aws/iam/model/UpdateGroupRequest.h>
 #include <aws/iam/model/UpdateLoginProfileRequest.h>
 #include <aws/iam/model/UpdateOpenIDConnectProviderThumbprintRequest.h>
+#include <aws/iam/model/UpdateRoleRequest.h>
 #include <aws/iam/model/UpdateRoleDescriptionRequest.h>
 #include <aws/iam/model/UpdateSAMLProviderRequest.h>
 #include <aws/iam/model/UpdateSSHPublicKeyRequest.h>
@@ -4145,6 +4146,41 @@ void IAMClient::UpdateOpenIDConnectProviderThumbprintAsyncHelper(const UpdateOpe
   handler(this, request, UpdateOpenIDConnectProviderThumbprint(request), context);
 }
 
+UpdateRoleOutcome IAMClient::UpdateRole(const UpdateRoleRequest& request) const
+{
+  Aws::StringStream ss;
+  Aws::Http::URI uri = m_uri;
+  ss << "/";
+  uri.SetPath(uri.GetPath() + ss.str());
+  XmlOutcome outcome = MakeRequest(uri, request, HttpMethod::HTTP_POST);
+  if(outcome.IsSuccess())
+  {
+    return UpdateRoleOutcome(UpdateRoleResult(outcome.GetResult()));
+  }
+  else
+  {
+    return UpdateRoleOutcome(outcome.GetError());
+  }
+}
+
+UpdateRoleOutcomeCallable IAMClient::UpdateRoleCallable(const UpdateRoleRequest& request) const
+{
+  auto task = Aws::MakeShared< std::packaged_task< UpdateRoleOutcome() > >(ALLOCATION_TAG, [this, request](){ return this->UpdateRole(request); } );
+  auto packagedFunction = [task]() { (*task)(); };
+  m_executor->Submit(packagedFunction);
+  return task->get_future();
+}
+
+void IAMClient::UpdateRoleAsync(const UpdateRoleRequest& request, const UpdateRoleResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  m_executor->Submit( [this, request, handler, context](){ this->UpdateRoleAsyncHelper( request, handler, context ); } );
+}
+
+void IAMClient::UpdateRoleAsyncHelper(const UpdateRoleRequest& request, const UpdateRoleResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+{
+  handler(this, request, UpdateRole(request), context);
+}
+
 UpdateRoleDescriptionOutcome IAMClient::UpdateRoleDescription(const UpdateRoleDescriptionRequest& request) const
 {
   Aws::StringStream ss;
diff --git a/aws-cpp-sdk-iam/source/model/CreateRoleRequest.cpp b/aws-cpp-sdk-iam/source/model/CreateRoleRequest.cpp
index 924ca64743e..0e79db7eefc 100644
--- a/aws-cpp-sdk-iam/source/model/CreateRoleRequest.cpp
+++ b/aws-cpp-sdk-iam/source/model/CreateRoleRequest.cpp
@@ -24,7 +24,9 @@ CreateRoleRequest::CreateRoleRequest() :
     m_pathHasBeenSet(false),
     m_roleNameHasBeenSet(false),
     m_assumeRolePolicyDocumentHasBeenSet(false),
-    m_descriptionHasBeenSet(false)
+    m_descriptionHasBeenSet(false),
+    m_maxSessionDuration(0),
+    m_maxSessionDurationHasBeenSet(false)
 {
 }
 
@@ -52,6 +54,11 @@ Aws::String CreateRoleRequest::SerializePayload() const
     ss << "Description=" << StringUtils::URLEncode(m_description.c_str()) << "&";
   }
 
+  if(m_maxSessionDurationHasBeenSet)
+  {
+    ss << "MaxSessionDuration=" << m_maxSessionDuration << "&";
+  }
+
   ss << "Version=2010-05-08";
   return ss.str();
 }
diff --git a/aws-cpp-sdk-iam/source/model/Role.cpp b/aws-cpp-sdk-iam/source/model/Role.cpp
index d11140140a9..3dc00eac133 100644
--- a/aws-cpp-sdk-iam/source/model/Role.cpp
+++ b/aws-cpp-sdk-iam/source/model/Role.cpp
@@ -37,7 +37,9 @@ Role::Role() :
     m_arnHasBeenSet(false),
     m_createDateHasBeenSet(false),
     m_assumeRolePolicyDocumentHasBeenSet(false),
-    m_descriptionHasBeenSet(false)
+    m_descriptionHasBeenSet(false),
+    m_maxSessionDuration(0),
+    m_maxSessionDurationHasBeenSet(false)
 {
 }
 
@@ -48,7 +50,9 @@ Role::Role(const XmlNode& xmlNode) :
     m_arnHasBeenSet(false),
     m_createDateHasBeenSet(false),
     m_assumeRolePolicyDocumentHasBeenSet(false),
-    m_descriptionHasBeenSet(false)
+    m_descriptionHasBeenSet(false),
+    m_maxSessionDuration(0),
+    m_maxSessionDurationHasBeenSet(false)
 {
   *this = xmlNode;
 }
@@ -101,6 +105,12 @@ Role& Role::operator =(const XmlNode& xmlNode)
       m_description = StringUtils::Trim(descriptionNode.GetText().c_str());
       m_descriptionHasBeenSet = true;
     }
+    XmlNode maxSessionDurationNode = resultNode.FirstChild("MaxSessionDuration");
+    if(!maxSessionDurationNode.IsNull())
+    {
+      m_maxSessionDuration = StringUtils::ConvertToInt32(StringUtils::Trim(maxSessionDurationNode.GetText().c_str()).c_str());
+      m_maxSessionDurationHasBeenSet = true;
+    }
   }
 
   return *this;
@@ -143,6 +153,11 @@ void Role::OutputToStream(Aws::OStream& oStream, const char* location, unsigned
       oStream << location << index << locationValue << ".Description=" << StringUtils::URLEncode(m_description.c_str()) << "&";
   }
 
+  if(m_maxSessionDurationHasBeenSet)
+  {
+      oStream << location << index << locationValue << ".MaxSessionDuration=" << m_maxSessionDuration << "&";
+  }
+
 }
 
 void Role::OutputToStream(Aws::OStream& oStream, const char* location) const
@@ -175,6 +190,10 @@ void Role::OutputToStream(Aws::OStream& oStream, const char* location) const
   {
       oStream << location << ".Description=" << StringUtils::URLEncode(m_description.c_str()) << "&";
   }
+  if(m_maxSessionDurationHasBeenSet)
+  {
+      oStream << location << ".MaxSessionDuration=" << m_maxSessionDuration << "&";
+  }
 }
 
 } // namespace Model
diff --git a/aws-cpp-sdk-iam/source/model/UpdateRoleRequest.cpp b/aws-cpp-sdk-iam/source/model/UpdateRoleRequest.cpp
new file mode 100644
index 00000000000..d0fe55f9a37
--- /dev/null
+++ b/aws-cpp-sdk-iam/source/model/UpdateRoleRequest.cpp
@@ -0,0 +1,58 @@
+/*
+* Copyright 2010-2017 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.
+*/
+
+#include <aws/iam/model/UpdateRoleRequest.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+using namespace Aws::IAM::Model;
+using namespace Aws::Utils;
+
+UpdateRoleRequest::UpdateRoleRequest() : 
+    m_roleNameHasBeenSet(false),
+    m_descriptionHasBeenSet(false),
+    m_maxSessionDuration(0),
+    m_maxSessionDurationHasBeenSet(false)
+{
+}
+
+Aws::String UpdateRoleRequest::SerializePayload() const
+{
+  Aws::StringStream ss;
+  ss << "Action=UpdateRole&";
+  if(m_roleNameHasBeenSet)
+  {
+    ss << "RoleName=" << StringUtils::URLEncode(m_roleName.c_str()) << "&";
+  }
+
+  if(m_descriptionHasBeenSet)
+  {
+    ss << "Description=" << StringUtils::URLEncode(m_description.c_str()) << "&";
+  }
+
+  if(m_maxSessionDurationHasBeenSet)
+  {
+    ss << "MaxSessionDuration=" << m_maxSessionDuration << "&";
+  }
+
+  ss << "Version=2010-05-08";
+  return ss.str();
+}
+
+
+void  UpdateRoleRequest::DumpBodyToUrl(Aws::Http::URI& uri ) const
+{
+  uri.SetQueryString(SerializePayload());
+}
diff --git a/aws-cpp-sdk-iam/source/model/UpdateRoleResult.cpp b/aws-cpp-sdk-iam/source/model/UpdateRoleResult.cpp
new file mode 100644
index 00000000000..6eb440df655
--- /dev/null
+++ b/aws-cpp-sdk-iam/source/model/UpdateRoleResult.cpp
@@ -0,0 +1,59 @@
+/*
+* Copyright 2010-2017 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.
+*/
+
+#include <aws/iam/model/UpdateRoleResult.h>
+#include <aws/core/utils/xml/XmlSerializer.h>
+#include <aws/core/AmazonWebServiceResult.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/logging/LogMacros.h>
+
+#include <utility>
+
+using namespace Aws::IAM::Model;
+using namespace Aws::Utils::Xml;
+using namespace Aws::Utils::Logging;
+using namespace Aws::Utils;
+using namespace Aws;
+
+UpdateRoleResult::UpdateRoleResult()
+{
+}
+
+UpdateRoleResult::UpdateRoleResult(const Aws::AmazonWebServiceResult<XmlDocument>& result)
+{
+  *this = result;
+}
+
+UpdateRoleResult& UpdateRoleResult::operator =(const Aws::AmazonWebServiceResult<XmlDocument>& result)
+{
+  const XmlDocument& xmlDocument = result.GetPayload();
+  XmlNode rootNode = xmlDocument.GetRootElement();
+  XmlNode resultNode = rootNode;
+  if (!rootNode.IsNull() && (rootNode.GetName() != "UpdateRoleResult"))
+  {
+    resultNode = rootNode.FirstChild("UpdateRoleResult");
+  }
+
+  if(!resultNode.IsNull())
+  {
+  }
+
+  if (!rootNode.IsNull()) {
+    XmlNode responseMetadataNode = rootNode.FirstChild("ResponseMetadata");
+    m_responseMetadata = responseMetadataNode;
+    AWS_LOGSTREAM_DEBUG("Aws::IAM::Model::UpdateRoleResult", "x-amzn-request-id: " << m_responseMetadata.GetRequestId() );
+  }
+  return *this;
+}
diff --git a/aws-cpp-sdk-identity-management/nuget/aws-cpp-sdk-identity-management.autopkg b/aws-cpp-sdk-identity-management/nuget/aws-cpp-sdk-identity-management.autopkg
index 096ec7c99fa..bd0a28dfb89 100644
--- a/aws-cpp-sdk-identity-management/nuget/aws-cpp-sdk-identity-management.autopkg
+++ b/aws-cpp-sdk-identity-management/nuget/aws-cpp-sdk-identity-management.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-IdentityManagement;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.23;
+        version : 1.4.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Identity Management);
@@ -48,9 +48,9 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23,
-            AWSSDKCPP-CognitoIdentity/1.4.20140630.23,
-            AWSSDKCPP-STS/1.4.20110615.23
+            AWSSDKCPP-Core/1.4.24,
+            AWSSDKCPP-CognitoIdentity/1.4.20140630.24,
+            AWSSDKCPP-STS/1.4.20110615.24
        }
     }
 
diff --git a/aws-cpp-sdk-importexport/nuget/aws-cpp-sdk-importexport.autopkg b/aws-cpp-sdk-importexport/nuget/aws-cpp-sdk-importexport.autopkg
index 7f24d185f8d..a65b0c276dc 100644
--- a/aws-cpp-sdk-importexport/nuget/aws-cpp-sdk-importexport.autopkg
+++ b/aws-cpp-sdk-importexport/nuget/aws-cpp-sdk-importexport.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-ImportExport;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20100601.23;
+        version : 1.4.20100601.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Import/Export);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-inspector/nuget/aws-cpp-sdk-inspector.autopkg b/aws-cpp-sdk-inspector/nuget/aws-cpp-sdk-inspector.autopkg
index 6ef5c024f94..6161d02eba7 100644
--- a/aws-cpp-sdk-inspector/nuget/aws-cpp-sdk-inspector.autopkg
+++ b/aws-cpp-sdk-inspector/nuget/aws-cpp-sdk-inspector.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Inspector;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20160216.23;
+        version : 1.4.20160216.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Inspector);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-iot-data/nuget/aws-cpp-sdk-iot-data.autopkg b/aws-cpp-sdk-iot-data/nuget/aws-cpp-sdk-iot-data.autopkg
index e637f0464f6..f844d2db09a 100644
--- a/aws-cpp-sdk-iot-data/nuget/aws-cpp-sdk-iot-data.autopkg
+++ b/aws-cpp-sdk-iot-data/nuget/aws-cpp-sdk-iot-data.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-IoTDataPlane;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20150528.23;
+        version : 1.4.20150528.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS IoT Data Plane);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-iot-jobs-data/nuget/aws-cpp-sdk-iot-jobs-data.autopkg b/aws-cpp-sdk-iot-jobs-data/nuget/aws-cpp-sdk-iot-jobs-data.autopkg
index 960ba5beb50..15e8cdd525b 100644
--- a/aws-cpp-sdk-iot-jobs-data/nuget/aws-cpp-sdk-iot-jobs-data.autopkg
+++ b/aws-cpp-sdk-iot-jobs-data/nuget/aws-cpp-sdk-iot-jobs-data.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-IoTJobsDataPlane;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170929.23;
+        version : 1.4.20170929.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS IoT Jobs Data Plane);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-iot/nuget/aws-cpp-sdk-iot.autopkg b/aws-cpp-sdk-iot/nuget/aws-cpp-sdk-iot.autopkg
index c4a6e8d7700..d176e00fbe7 100644
--- a/aws-cpp-sdk-iot/nuget/aws-cpp-sdk-iot.autopkg
+++ b/aws-cpp-sdk-iot/nuget/aws-cpp-sdk-iot.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-IoT;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20150528.23;
+        version : 1.4.20150528.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS IoT);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-kinesis-video-archived-media/nuget/aws-cpp-sdk-kinesis-video-archived-media.autopkg b/aws-cpp-sdk-kinesis-video-archived-media/nuget/aws-cpp-sdk-kinesis-video-archived-media.autopkg
index 78c748445a3..2ba3d011951 100644
--- a/aws-cpp-sdk-kinesis-video-archived-media/nuget/aws-cpp-sdk-kinesis-video-archived-media.autopkg
+++ b/aws-cpp-sdk-kinesis-video-archived-media/nuget/aws-cpp-sdk-kinesis-video-archived-media.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-KinesisVideoArchivedMedia;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170930.23;
+        version : 1.4.20170930.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Kinesis Video Streams Archived Media);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-kinesis-video-media/nuget/aws-cpp-sdk-kinesis-video-media.autopkg b/aws-cpp-sdk-kinesis-video-media/nuget/aws-cpp-sdk-kinesis-video-media.autopkg
index 13c1fd6ce18..c844e431254 100644
--- a/aws-cpp-sdk-kinesis-video-media/nuget/aws-cpp-sdk-kinesis-video-media.autopkg
+++ b/aws-cpp-sdk-kinesis-video-media/nuget/aws-cpp-sdk-kinesis-video-media.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-KinesisVideoMedia;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170930.23;
+        version : 1.4.20170930.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Kinesis Video Streams Media);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-kinesis/nuget/aws-cpp-sdk-kinesis.autopkg b/aws-cpp-sdk-kinesis/nuget/aws-cpp-sdk-kinesis.autopkg
index 64a1f85cbf2..1daefbceb14 100644
--- a/aws-cpp-sdk-kinesis/nuget/aws-cpp-sdk-kinesis.autopkg
+++ b/aws-cpp-sdk-kinesis/nuget/aws-cpp-sdk-kinesis.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Kinesis;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20131202.23;
+        version : 1.4.20131202.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Kinesis);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-kinesisanalytics/nuget/aws-cpp-sdk-kinesisanalytics.autopkg b/aws-cpp-sdk-kinesisanalytics/nuget/aws-cpp-sdk-kinesisanalytics.autopkg
index 50a4f464300..c6cf4716b6b 100644
--- a/aws-cpp-sdk-kinesisanalytics/nuget/aws-cpp-sdk-kinesisanalytics.autopkg
+++ b/aws-cpp-sdk-kinesisanalytics/nuget/aws-cpp-sdk-kinesisanalytics.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-KinesisAnalytics;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20150814.23;
+        version : 1.4.20150814.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Kinesis Analytics);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-kinesisvideo/nuget/aws-cpp-sdk-kinesisvideo.autopkg b/aws-cpp-sdk-kinesisvideo/nuget/aws-cpp-sdk-kinesisvideo.autopkg
index 2c139ba7caf..5fe363cc1e5 100644
--- a/aws-cpp-sdk-kinesisvideo/nuget/aws-cpp-sdk-kinesisvideo.autopkg
+++ b/aws-cpp-sdk-kinesisvideo/nuget/aws-cpp-sdk-kinesisvideo.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-KinesisVideo;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170930.23;
+        version : 1.4.20170930.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Kinesis Video Streams);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-kms/nuget/aws-cpp-sdk-kms.autopkg b/aws-cpp-sdk-kms/nuget/aws-cpp-sdk-kms.autopkg
index 0c78e6b1ef6..85613be5f32 100644
--- a/aws-cpp-sdk-kms/nuget/aws-cpp-sdk-kms.autopkg
+++ b/aws-cpp-sdk-kms/nuget/aws-cpp-sdk-kms.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-KMS;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20141101.23;
+        version : 1.4.20141101.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Key Management Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-lambda/nuget/aws-cpp-sdk-lambda.autopkg b/aws-cpp-sdk-lambda/nuget/aws-cpp-sdk-lambda.autopkg
index e4367dce712..18c7b112f01 100644
--- a/aws-cpp-sdk-lambda/nuget/aws-cpp-sdk-lambda.autopkg
+++ b/aws-cpp-sdk-lambda/nuget/aws-cpp-sdk-lambda.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Lambda;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20150331.23;
+        version : 1.4.20150331.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Lambda);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-lex-models/nuget/aws-cpp-sdk-lex-models.autopkg b/aws-cpp-sdk-lex-models/nuget/aws-cpp-sdk-lex-models.autopkg
index 4e96e945854..aff1892fd24 100644
--- a/aws-cpp-sdk-lex-models/nuget/aws-cpp-sdk-lex-models.autopkg
+++ b/aws-cpp-sdk-lex-models/nuget/aws-cpp-sdk-lex-models.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-LexModelBuildingService;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170419.23;
+        version : 1.4.20170419.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Lex Model Building Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-lex/nuget/aws-cpp-sdk-lex.autopkg b/aws-cpp-sdk-lex/nuget/aws-cpp-sdk-lex.autopkg
index 85a6455563b..a15849a0c91 100644
--- a/aws-cpp-sdk-lex/nuget/aws-cpp-sdk-lex.autopkg
+++ b/aws-cpp-sdk-lex/nuget/aws-cpp-sdk-lex.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-LexRuntimeService;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20161128.23;
+        version : 1.4.20161128.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Lex Runtime Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-lightsail/nuget/aws-cpp-sdk-lightsail.autopkg b/aws-cpp-sdk-lightsail/nuget/aws-cpp-sdk-lightsail.autopkg
index d0753525b1a..2c810da7cc7 100644
--- a/aws-cpp-sdk-lightsail/nuget/aws-cpp-sdk-lightsail.autopkg
+++ b/aws-cpp-sdk-lightsail/nuget/aws-cpp-sdk-lightsail.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Lightsail;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20161128.23;
+        version : 1.4.20161128.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Lightsail);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-logs/nuget/aws-cpp-sdk-logs.autopkg b/aws-cpp-sdk-logs/nuget/aws-cpp-sdk-logs.autopkg
index a7eff7a4a67..1882aabdc87 100644
--- a/aws-cpp-sdk-logs/nuget/aws-cpp-sdk-logs.autopkg
+++ b/aws-cpp-sdk-logs/nuget/aws-cpp-sdk-logs.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CloudWatchLogs;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20140328.23;
+        version : 1.4.20140328.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon CloudWatch Logs);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-machinelearning/nuget/aws-cpp-sdk-machinelearning.autopkg b/aws-cpp-sdk-machinelearning/nuget/aws-cpp-sdk-machinelearning.autopkg
index 40cf3482af2..8d6cfec34c3 100644
--- a/aws-cpp-sdk-machinelearning/nuget/aws-cpp-sdk-machinelearning.autopkg
+++ b/aws-cpp-sdk-machinelearning/nuget/aws-cpp-sdk-machinelearning.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-MachineLearning;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20141212.23;
+        version : 1.4.20141212.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Machine Learning);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-marketplace-entitlement/nuget/aws-cpp-sdk-marketplace-entitlement.autopkg b/aws-cpp-sdk-marketplace-entitlement/nuget/aws-cpp-sdk-marketplace-entitlement.autopkg
index d6898ef1e54..d141e37f67c 100644
--- a/aws-cpp-sdk-marketplace-entitlement/nuget/aws-cpp-sdk-marketplace-entitlement.autopkg
+++ b/aws-cpp-sdk-marketplace-entitlement/nuget/aws-cpp-sdk-marketplace-entitlement.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-MarketplaceEntitlementService;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170111.23;
+        version : 1.4.20170111.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Marketplace Entitlement Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-marketplacecommerceanalytics/nuget/aws-cpp-sdk-marketplacecommerceanalytics.autopkg b/aws-cpp-sdk-marketplacecommerceanalytics/nuget/aws-cpp-sdk-marketplacecommerceanalytics.autopkg
index a8c6db8c0fe..bf26c04e6b2 100644
--- a/aws-cpp-sdk-marketplacecommerceanalytics/nuget/aws-cpp-sdk-marketplacecommerceanalytics.autopkg
+++ b/aws-cpp-sdk-marketplacecommerceanalytics/nuget/aws-cpp-sdk-marketplacecommerceanalytics.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-MarketplaceCommerceAnalytics;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20150701.23;
+        version : 1.4.20150701.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Marketplace Commerce Analytics);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-mediaconvert/nuget/aws-cpp-sdk-mediaconvert.autopkg b/aws-cpp-sdk-mediaconvert/nuget/aws-cpp-sdk-mediaconvert.autopkg
index dda1159da59..1174874bf3e 100644
--- a/aws-cpp-sdk-mediaconvert/nuget/aws-cpp-sdk-mediaconvert.autopkg
+++ b/aws-cpp-sdk-mediaconvert/nuget/aws-cpp-sdk-mediaconvert.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-MediaConvert;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170829.23;
+        version : 1.4.20170829.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Elemental MediaConvert);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-medialive/nuget/aws-cpp-sdk-medialive.autopkg b/aws-cpp-sdk-medialive/nuget/aws-cpp-sdk-medialive.autopkg
index 036a4cff343..b1763a30fa1 100644
--- a/aws-cpp-sdk-medialive/nuget/aws-cpp-sdk-medialive.autopkg
+++ b/aws-cpp-sdk-medialive/nuget/aws-cpp-sdk-medialive.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-MediaLive;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20171014.23;
+        version : 1.4.20171014.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Elemental MediaLive);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-mediapackage/nuget/aws-cpp-sdk-mediapackage.autopkg b/aws-cpp-sdk-mediapackage/nuget/aws-cpp-sdk-mediapackage.autopkg
index 1f6cbee9ed9..64f8c96f711 100644
--- a/aws-cpp-sdk-mediapackage/nuget/aws-cpp-sdk-mediapackage.autopkg
+++ b/aws-cpp-sdk-mediapackage/nuget/aws-cpp-sdk-mediapackage.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-MediaPackage;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20171012.23;
+        version : 1.4.20171012.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Elemental MediaPackage);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-mediastore-data/nuget/aws-cpp-sdk-mediastore-data.autopkg b/aws-cpp-sdk-mediastore-data/nuget/aws-cpp-sdk-mediastore-data.autopkg
index 603b40bf69b..1ca8c603e30 100644
--- a/aws-cpp-sdk-mediastore-data/nuget/aws-cpp-sdk-mediastore-data.autopkg
+++ b/aws-cpp-sdk-mediastore-data/nuget/aws-cpp-sdk-mediastore-data.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-MediaStoreData;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170901.23;
+        version : 1.4.20170901.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Elemental MediaStore Data Plane);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-mediastore/nuget/aws-cpp-sdk-mediastore.autopkg b/aws-cpp-sdk-mediastore/nuget/aws-cpp-sdk-mediastore.autopkg
index 4fa82fb4808..b40f2bbb8ff 100644
--- a/aws-cpp-sdk-mediastore/nuget/aws-cpp-sdk-mediastore.autopkg
+++ b/aws-cpp-sdk-mediastore/nuget/aws-cpp-sdk-mediastore.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-MediaStore;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170901.23;
+        version : 1.4.20170901.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Elemental MediaStore);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-meteringmarketplace/nuget/aws-cpp-sdk-meteringmarketplace.autopkg b/aws-cpp-sdk-meteringmarketplace/nuget/aws-cpp-sdk-meteringmarketplace.autopkg
index 430769d9614..663e371b82f 100644
--- a/aws-cpp-sdk-meteringmarketplace/nuget/aws-cpp-sdk-meteringmarketplace.autopkg
+++ b/aws-cpp-sdk-meteringmarketplace/nuget/aws-cpp-sdk-meteringmarketplace.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-MarketplaceMetering;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20160114.23;
+        version : 1.4.20160114.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWSMarketplace Metering);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-mobile/nuget/aws-cpp-sdk-mobile.autopkg b/aws-cpp-sdk-mobile/nuget/aws-cpp-sdk-mobile.autopkg
index 8c6ca03fdb9..82b14fc3851 100644
--- a/aws-cpp-sdk-mobile/nuget/aws-cpp-sdk-mobile.autopkg
+++ b/aws-cpp-sdk-mobile/nuget/aws-cpp-sdk-mobile.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Mobile;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170701.23;
+        version : 1.4.20170701.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Mobile);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-mobileanalytics/nuget/aws-cpp-sdk-mobileanalytics.autopkg b/aws-cpp-sdk-mobileanalytics/nuget/aws-cpp-sdk-mobileanalytics.autopkg
index 7d0864f79eb..49f706a2243 100644
--- a/aws-cpp-sdk-mobileanalytics/nuget/aws-cpp-sdk-mobileanalytics.autopkg
+++ b/aws-cpp-sdk-mobileanalytics/nuget/aws-cpp-sdk-mobileanalytics.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-MobileAnalytics;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20140605.23;
+        version : 1.4.20140605.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Mobile Analytics);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-monitoring/nuget/aws-cpp-sdk-monitoring.autopkg b/aws-cpp-sdk-monitoring/nuget/aws-cpp-sdk-monitoring.autopkg
index d82d443665e..1a944cec4b1 100644
--- a/aws-cpp-sdk-monitoring/nuget/aws-cpp-sdk-monitoring.autopkg
+++ b/aws-cpp-sdk-monitoring/nuget/aws-cpp-sdk-monitoring.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-CloudWatch;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20100801.23;
+        version : 1.4.20100801.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon CloudWatch);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-mq/nuget/aws-cpp-sdk-mq.autopkg b/aws-cpp-sdk-mq/nuget/aws-cpp-sdk-mq.autopkg
index 10edc74624f..d05721a003d 100644
--- a/aws-cpp-sdk-mq/nuget/aws-cpp-sdk-mq.autopkg
+++ b/aws-cpp-sdk-mq/nuget/aws-cpp-sdk-mq.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-MQ;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20171127.23;
+        version : 1.4.20171127.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AmazonMQ);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/MTurkClient.h b/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/MTurkClient.h
index 6878ff54519..8042a850817 100644
--- a/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/MTurkClient.h
+++ b/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/MTurkClient.h
@@ -1369,22 +1369,18 @@ namespace Model
         virtual void ListQualificationRequestsAsync(const Model::ListQualificationRequestsRequest& request, const ListQualificationRequestsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
 
         /**
-         * <p> The <code>ListQualificationRequests</code> operation retrieves requests for
-         * Qualifications of a particular Qualification type. The owner of the
-         * Qualification type calls this operation to poll for pending requests, and
-         * accepts them using the AcceptQualification operation. </p><p><h3>See Also:</h3> 
-         * <a
+         * <p> The <code>ListQualificationTypes</code> operation returns a list of
+         * Qualification types, filtered by an optional search term. </p><p><h3>See
+         * Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/mturk-requester-2017-01-17/ListQualificationTypes">AWS
          * API Reference</a></p>
          */
         virtual Model::ListQualificationTypesOutcome ListQualificationTypes(const Model::ListQualificationTypesRequest& request) const;
 
         /**
-         * <p> The <code>ListQualificationRequests</code> operation retrieves requests for
-         * Qualifications of a particular Qualification type. The owner of the
-         * Qualification type calls this operation to poll for pending requests, and
-         * accepts them using the AcceptQualification operation. </p><p><h3>See Also:</h3> 
-         * <a
+         * <p> The <code>ListQualificationTypes</code> operation returns a list of
+         * Qualification types, filtered by an optional search term. </p><p><h3>See
+         * Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/mturk-requester-2017-01-17/ListQualificationTypes">AWS
          * API Reference</a></p>
          *
@@ -1393,11 +1389,9 @@ namespace Model
         virtual Model::ListQualificationTypesOutcomeCallable ListQualificationTypesCallable(const Model::ListQualificationTypesRequest& request) const;
 
         /**
-         * <p> The <code>ListQualificationRequests</code> operation retrieves requests for
-         * Qualifications of a particular Qualification type. The owner of the
-         * Qualification type calls this operation to poll for pending requests, and
-         * accepts them using the AcceptQualification operation. </p><p><h3>See Also:</h3> 
-         * <a
+         * <p> The <code>ListQualificationTypes</code> operation returns a list of
+         * Qualification types, filtered by an optional search term. </p><p><h3>See
+         * Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/mturk-requester-2017-01-17/ListQualificationTypes">AWS
          * API Reference</a></p>
          *
diff --git a/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/CreateHITRequest.h b/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/CreateHITRequest.h
index b4fdb49cb3a..dba980af1c4 100644
--- a/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/CreateHITRequest.h
+++ b/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/CreateHITRequest.h
@@ -492,44 +492,65 @@ namespace Model
 
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet before the Worker is
-     * allowed to accept and complete the HIT. </p>
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
+     * HIT. A HIT can have between zero and ten Qualification requirements. All
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline const Aws::Vector<QualificationRequirement>& GetQualificationRequirements() const{ return m_qualificationRequirements; }
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet before the Worker is
-     * allowed to accept and complete the HIT. </p>
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
+     * HIT. A HIT can have between zero and ten Qualification requirements. All
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline void SetQualificationRequirements(const Aws::Vector<QualificationRequirement>& value) { m_qualificationRequirementsHasBeenSet = true; m_qualificationRequirements = value; }
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet before the Worker is
-     * allowed to accept and complete the HIT. </p>
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
+     * HIT. A HIT can have between zero and ten Qualification requirements. All
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline void SetQualificationRequirements(Aws::Vector<QualificationRequirement>&& value) { m_qualificationRequirementsHasBeenSet = true; m_qualificationRequirements = std::move(value); }
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet before the Worker is
-     * allowed to accept and complete the HIT. </p>
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
+     * HIT. A HIT can have between zero and ten Qualification requirements. All
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline CreateHITRequest& WithQualificationRequirements(const Aws::Vector<QualificationRequirement>& value) { SetQualificationRequirements(value); return *this;}
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet before the Worker is
-     * allowed to accept and complete the HIT. </p>
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
+     * HIT. A HIT can have between zero and ten Qualification requirements. All
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline CreateHITRequest& WithQualificationRequirements(Aws::Vector<QualificationRequirement>&& value) { SetQualificationRequirements(std::move(value)); return *this;}
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet before the Worker is
-     * allowed to accept and complete the HIT. </p>
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
+     * HIT. A HIT can have between zero and ten Qualification requirements. All
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline CreateHITRequest& AddQualificationRequirements(const QualificationRequirement& value) { m_qualificationRequirementsHasBeenSet = true; m_qualificationRequirements.push_back(value); return *this; }
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet before the Worker is
-     * allowed to accept and complete the HIT. </p>
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
+     * HIT. A HIT can have between zero and ten Qualification requirements. All
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline CreateHITRequest& AddQualificationRequirements(QualificationRequirement&& value) { m_qualificationRequirementsHasBeenSet = true; m_qualificationRequirements.push_back(std::move(value)); return *this; }
 
diff --git a/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/CreateHITTypeRequest.h b/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/CreateHITTypeRequest.h
index accdb9ffadf..8041a32c077 100644
--- a/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/CreateHITTypeRequest.h
+++ b/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/CreateHITTypeRequest.h
@@ -297,44 +297,65 @@ namespace Model
 
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet before the Worker is
-     * allowed to accept and complete the HIT. </p>
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
+     * HIT. A HIT can have between zero and ten Qualification requirements. All
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline const Aws::Vector<QualificationRequirement>& GetQualificationRequirements() const{ return m_qualificationRequirements; }
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet before the Worker is
-     * allowed to accept and complete the HIT. </p>
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
+     * HIT. A HIT can have between zero and ten Qualification requirements. All
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline void SetQualificationRequirements(const Aws::Vector<QualificationRequirement>& value) { m_qualificationRequirementsHasBeenSet = true; m_qualificationRequirements = value; }
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet before the Worker is
-     * allowed to accept and complete the HIT. </p>
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
+     * HIT. A HIT can have between zero and ten Qualification requirements. All
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline void SetQualificationRequirements(Aws::Vector<QualificationRequirement>&& value) { m_qualificationRequirementsHasBeenSet = true; m_qualificationRequirements = std::move(value); }
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet before the Worker is
-     * allowed to accept and complete the HIT. </p>
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
+     * HIT. A HIT can have between zero and ten Qualification requirements. All
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline CreateHITTypeRequest& WithQualificationRequirements(const Aws::Vector<QualificationRequirement>& value) { SetQualificationRequirements(value); return *this;}
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet before the Worker is
-     * allowed to accept and complete the HIT. </p>
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
+     * HIT. A HIT can have between zero and ten Qualification requirements. All
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline CreateHITTypeRequest& WithQualificationRequirements(Aws::Vector<QualificationRequirement>&& value) { SetQualificationRequirements(std::move(value)); return *this;}
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet before the Worker is
-     * allowed to accept and complete the HIT. </p>
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
+     * HIT. A HIT can have between zero and ten Qualification requirements. All
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline CreateHITTypeRequest& AddQualificationRequirements(const QualificationRequirement& value) { m_qualificationRequirementsHasBeenSet = true; m_qualificationRequirements.push_back(value); return *this; }
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet before the Worker is
-     * allowed to accept and complete the HIT. </p>
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
+     * HIT. A HIT can have between zero and ten Qualification requirements. All
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline CreateHITTypeRequest& AddQualificationRequirements(QualificationRequirement&& value) { m_qualificationRequirementsHasBeenSet = true; m_qualificationRequirements.push_back(std::move(value)); return *this; }
 
diff --git a/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/HIT.h b/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/HIT.h
index a95f4289644..42113c070d0 100644
--- a/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/HIT.h
+++ b/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/HIT.h
@@ -581,58 +581,65 @@ namespace Model
 
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet in order to accept the
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
      * HIT. A HIT can have between zero and ten Qualification requirements. All
-     * requirements must be met by a Worker's Qualifications for the Worker to accept
-     * the HIT.</p>
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline const Aws::Vector<QualificationRequirement>& GetQualificationRequirements() const{ return m_qualificationRequirements; }
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet in order to accept the
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
      * HIT. A HIT can have between zero and ten Qualification requirements. All
-     * requirements must be met by a Worker's Qualifications for the Worker to accept
-     * the HIT.</p>
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline void SetQualificationRequirements(const Aws::Vector<QualificationRequirement>& value) { m_qualificationRequirementsHasBeenSet = true; m_qualificationRequirements = value; }
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet in order to accept the
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
      * HIT. A HIT can have between zero and ten Qualification requirements. All
-     * requirements must be met by a Worker's Qualifications for the Worker to accept
-     * the HIT.</p>
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline void SetQualificationRequirements(Aws::Vector<QualificationRequirement>&& value) { m_qualificationRequirementsHasBeenSet = true; m_qualificationRequirements = std::move(value); }
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet in order to accept the
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
      * HIT. A HIT can have between zero and ten Qualification requirements. All
-     * requirements must be met by a Worker's Qualifications for the Worker to accept
-     * the HIT.</p>
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline HIT& WithQualificationRequirements(const Aws::Vector<QualificationRequirement>& value) { SetQualificationRequirements(value); return *this;}
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet in order to accept the
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
      * HIT. A HIT can have between zero and ten Qualification requirements. All
-     * requirements must be met by a Worker's Qualifications for the Worker to accept
-     * the HIT.</p>
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline HIT& WithQualificationRequirements(Aws::Vector<QualificationRequirement>&& value) { SetQualificationRequirements(std::move(value)); return *this;}
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet in order to accept the
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
      * HIT. A HIT can have between zero and ten Qualification requirements. All
-     * requirements must be met by a Worker's Qualifications for the Worker to accept
-     * the HIT.</p>
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline HIT& AddQualificationRequirements(const QualificationRequirement& value) { m_qualificationRequirementsHasBeenSet = true; m_qualificationRequirements.push_back(value); return *this; }
 
     /**
-     * <p> A condition that a Worker's Qualifications must meet in order to accept the
+     * <p> Conditions that a Worker's Qualifications must meet in order to accept the
      * HIT. A HIT can have between zero and ten Qualification requirements. All
-     * requirements must be met by a Worker's Qualifications for the Worker to accept
-     * the HIT.</p>
+     * requirements must be met in order for a Worker to accept the HIT. Additionally,
+     * other actions can be restricted using the <code>ActionsGuarded</code> field on
+     * each <code>QualificationRequirement</code> structure. </p>
      */
     inline HIT& AddQualificationRequirements(QualificationRequirement&& value) { m_qualificationRequirementsHasBeenSet = true; m_qualificationRequirements.push_back(std::move(value)); return *this; }
 
diff --git a/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/HITAccessActions.h b/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/HITAccessActions.h
new file mode 100644
index 00000000000..b25c66973bc
--- /dev/null
+++ b/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/HITAccessActions.h
@@ -0,0 +1,42 @@
+/*
+* Copyright 2010-2017 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.
+*/
+
+#pragma once
+#include <aws/mturk-requester/MTurk_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+
+namespace Aws
+{
+namespace MTurk
+{
+namespace Model
+{
+  enum class HITAccessActions
+  {
+    NOT_SET,
+    Accept,
+    PreviewAndAccept,
+    DiscoverPreviewAndAccept
+  };
+
+namespace HITAccessActionsMapper
+{
+AWS_MTURK_API HITAccessActions GetHITAccessActionsForName(const Aws::String& name);
+
+AWS_MTURK_API Aws::String GetNameForHITAccessActions(HITAccessActions value);
+} // namespace HITAccessActionsMapper
+} // namespace Model
+} // namespace MTurk
+} // namespace Aws
diff --git a/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/QualificationRequirement.h b/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/QualificationRequirement.h
index d86b39bfb74..41c2a6a52b4 100644
--- a/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/QualificationRequirement.h
+++ b/aws-cpp-sdk-mturk-requester/include/aws/mturk-requester/model/QualificationRequirement.h
@@ -18,6 +18,7 @@
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/mturk-requester/model/Comparator.h>
 #include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/mturk-requester/model/HITAccessActions.h>
 #include <aws/mturk-requester/model/Locale.h>
 #include <utility>
 
@@ -39,7 +40,7 @@ namespace Model
    * <p> The QualificationRequirement data structure describes a Qualification that a
    * Worker must have before the Worker is allowed to accept a HIT. A requirement may
    * optionally state that a Worker must have the Qualification in order to preview
-   * the HIT. </p><p><h3>See Also:</h3>   <a
+   * the HIT, or see the HIT in search results. </p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/mturk-requester-2017-01-17/QualificationRequirement">AWS
    * API Reference</a></p>
    */
@@ -296,40 +297,109 @@ namespace Model
 
 
     /**
-     * <p> If true, the question data for the HIT will not be shown when a Worker whose
-     * Qualifications do not meet this requirement tries to preview the HIT. That is, a
-     * Worker's Qualifications must meet all of the requirements for which
-     * RequiredToPreview is true in order to preview the HIT. If a Worker meets all of
-     * the requirements where RequiredToPreview is true (or if there are no such
-     * requirements), but does not meet all of the requirements for the HIT, the Worker
-     * will be allowed to preview the HIT's question data, but will not be allowed to
-     * accept and complete the HIT. The default is false. </p>
+     * <p> Setting this attribute prevents Workers whose Qualifications do not meet
+     * this QualificationRequirement from taking the specified action. Valid arguments
+     * include "Accept" (Worker cannot accept the HIT, but can preview the HIT and see
+     * it in their search results), "PreviewAndAccept" (Worker cannot accept or preview
+     * the HIT, but can see the HIT in their search results), and
+     * "DiscoverPreviewAndAccept" (Worker cannot accept, preview, or see the HIT in
+     * their search results). It's possible for you to create a HIT with multiple
+     * QualificationRequirements (which can have different values for the ActionGuarded
+     * attribute). In this case, the Worker is only permitted to perform an action when
+     * they have met all QualificationRequirements guarding the action. The actions in
+     * the order of least restrictive to most restrictive are Discover, Preview and
+     * Accept. For example, if a Worker meets all QualificationRequirements that are
+     * set to DiscoverPreviewAndAccept, but do not meet all requirements that are set
+     * with PreviewAndAccept, then the Worker will be able to Discover, i.e. see the
+     * HIT in their search result, but will not be able to Preview or Accept the HIT.
+     * ActionsGuarded should not be used in combination with the
+     * <code>RequiredToPreview</code> field. </p>
      */
-    inline bool GetRequiredToPreview() const{ return m_requiredToPreview; }
+    inline const HITAccessActions& GetActionsGuarded() const{ return m_actionsGuarded; }
 
     /**
-     * <p> If true, the question data for the HIT will not be shown when a Worker whose
-     * Qualifications do not meet this requirement tries to preview the HIT. That is, a
-     * Worker's Qualifications must meet all of the requirements for which
-     * RequiredToPreview is true in order to preview the HIT. If a Worker meets all of
-     * the requirements where RequiredToPreview is true (or if there are no such
-     * requirements), but does not meet all of the requirements for the HIT, the Worker
-     * will be allowed to preview the HIT's question data, but will not be allowed to
-     * accept and complete the HIT. The default is false. </p>
+     * <p> Setting this attribute prevents Workers whose Qualifications do not meet
+     * this QualificationRequirement from taking the specified action. Valid arguments
+     * include "Accept" (Worker cannot accept the HIT, but can preview the HIT and see
+     * it in their search results), "PreviewAndAccept" (Worker cannot accept or preview
+     * the HIT, but can see the HIT in their search results), and
+     * "DiscoverPreviewAndAccept" (Worker cannot accept, preview, or see the HIT in
+     * their search results). It's possible for you to create a HIT with multiple
+     * QualificationRequirements (which can have different values for the ActionGuarded
+     * attribute). In this case, the Worker is only permitted to perform an action when
+     * they have met all QualificationRequirements guarding the action. The actions in
+     * the order of least restrictive to most restrictive are Discover, Preview and
+     * Accept. For example, if a Worker meets all QualificationRequirements that are
+     * set to DiscoverPreviewAndAccept, but do not meet all requirements that are set
+     * with PreviewAndAccept, then the Worker will be able to Discover, i.e. see the
+     * HIT in their search result, but will not be able to Preview or Accept the HIT.
+     * ActionsGuarded should not be used in combination with the
+     * <code>RequiredToPreview</code> field. </p>
      */
-    inline void SetRequiredToPreview(bool value) { m_requiredToPreviewHasBeenSet = true; m_requiredToPreview = value; }
+    inline void SetActionsGuarded(const HITAccessActions& value) { m_actionsGuardedHasBeenSet = true; m_actionsGuarded = value; }
 
     /**
-     * <p> If true, the question data for the HIT will not be shown when a Worker whose
-     * Qualifications do not meet this requirement tries to preview the HIT. That is, a
-     * Worker's Qualifications must meet all of the requirements for which
-     * RequiredToPreview is true in order to preview the HIT. If a Worker meets all of
-     * the requirements where RequiredToPreview is true (or if there are no such
-     * requirements), but does not meet all of the requirements for the HIT, the Worker
-     * will be allowed to preview the HIT's question data, but will not be allowed to
-     * accept and complete the HIT. The default is false. </p>
+     * <p> Setting this attribute prevents Workers whose Qualifications do not meet
+     * this QualificationRequirement from taking the specified action. Valid arguments
+     * include "Accept" (Worker cannot accept the HIT, but can preview the HIT and see
+     * it in their search results), "PreviewAndAccept" (Worker cannot accept or preview
+     * the HIT, but can see the HIT in their search results), and
+     * "DiscoverPreviewAndAccept" (Worker cannot accept, preview, or see the HIT in
+     * their search results). It's possible for you to create a HIT with multiple
+     * QualificationRequirements (which can have different values for the ActionGuarded
+     * attribute). In this case, the Worker is only permitted to perform an action when
+     * they have met all QualificationRequirements guarding the action. The actions in
+     * the order of least restrictive to most restrictive are Discover, Preview and
+     * Accept. For example, if a Worker meets all QualificationRequirements that are
+     * set to DiscoverPreviewAndAccept, but do not meet all requirements that are set
+     * with PreviewAndAccept, then the Worker will be able to Discover, i.e. see the
+     * HIT in their search result, but will not be able to Preview or Accept the HIT.
+     * ActionsGuarded should not be used in combination with the
+     * <code>RequiredToPreview</code> field. </p>
      */
-    inline QualificationRequirement& WithRequiredToPreview(bool value) { SetRequiredToPreview(value); return *this;}
+    inline void SetActionsGuarded(HITAccessActions&& value) { m_actionsGuardedHasBeenSet = true; m_actionsGuarded = std::move(value); }
+
+    /**
+     * <p> Setting this attribute prevents Workers whose Qualifications do not meet
+     * this QualificationRequirement from taking the specified action. Valid arguments
+     * include "Accept" (Worker cannot accept the HIT, but can preview the HIT and see
+     * it in their search results), "PreviewAndAccept" (Worker cannot accept or preview
+     * the HIT, but can see the HIT in their search results), and
+     * "DiscoverPreviewAndAccept" (Worker cannot accept, preview, or see the HIT in
+     * their search results). It's possible for you to create a HIT with multiple
+     * QualificationRequirements (which can have different values for the ActionGuarded
+     * attribute). In this case, the Worker is only permitted to perform an action when
+     * they have met all QualificationRequirements guarding the action. The actions in
+     * the order of least restrictive to most restrictive are Discover, Preview and
+     * Accept. For example, if a Worker meets all QualificationRequirements that are
+     * set to DiscoverPreviewAndAccept, but do not meet all requirements that are set
+     * with PreviewAndAccept, then the Worker will be able to Discover, i.e. see the
+     * HIT in their search result, but will not be able to Preview or Accept the HIT.
+     * ActionsGuarded should not be used in combination with the
+     * <code>RequiredToPreview</code> field. </p>
+     */
+    inline QualificationRequirement& WithActionsGuarded(const HITAccessActions& value) { SetActionsGuarded(value); return *this;}
+
+    /**
+     * <p> Setting this attribute prevents Workers whose Qualifications do not meet
+     * this QualificationRequirement from taking the specified action. Valid arguments
+     * include "Accept" (Worker cannot accept the HIT, but can preview the HIT and see
+     * it in their search results), "PreviewAndAccept" (Worker cannot accept or preview
+     * the HIT, but can see the HIT in their search results), and
+     * "DiscoverPreviewAndAccept" (Worker cannot accept, preview, or see the HIT in
+     * their search results). It's possible for you to create a HIT with multiple
+     * QualificationRequirements (which can have different values for the ActionGuarded
+     * attribute). In this case, the Worker is only permitted to perform an action when
+     * they have met all QualificationRequirements guarding the action. The actions in
+     * the order of least restrictive to most restrictive are Discover, Preview and
+     * Accept. For example, if a Worker meets all QualificationRequirements that are
+     * set to DiscoverPreviewAndAccept, but do not meet all requirements that are set
+     * with PreviewAndAccept, then the Worker will be able to Discover, i.e. see the
+     * HIT in their search result, but will not be able to Preview or Accept the HIT.
+     * ActionsGuarded should not be used in combination with the
+     * <code>RequiredToPreview</code> field. </p>
+     */
+    inline QualificationRequirement& WithActionsGuarded(HITAccessActions&& value) { SetActionsGuarded(std::move(value)); return *this;}
 
   private:
 
@@ -345,8 +415,8 @@ namespace Model
     Aws::Vector<Locale> m_localeValues;
     bool m_localeValuesHasBeenSet;
 
-    bool m_requiredToPreview;
-    bool m_requiredToPreviewHasBeenSet;
+    HITAccessActions m_actionsGuarded;
+    bool m_actionsGuardedHasBeenSet;
   };
 
 } // namespace Model
diff --git a/aws-cpp-sdk-mturk-requester/nuget/aws-cpp-sdk-mturk-requester.autopkg b/aws-cpp-sdk-mturk-requester/nuget/aws-cpp-sdk-mturk-requester.autopkg
index 389508a9c04..9227df05582 100644
--- a/aws-cpp-sdk-mturk-requester/nuget/aws-cpp-sdk-mturk-requester.autopkg
+++ b/aws-cpp-sdk-mturk-requester/nuget/aws-cpp-sdk-mturk-requester.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-MTurk;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170117.23;
+        version : 1.4.20170117.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Mechanical Turk);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-mturk-requester/source/model/HITAccessActions.cpp b/aws-cpp-sdk-mturk-requester/source/model/HITAccessActions.cpp
new file mode 100644
index 00000000000..8f2e55e5d40
--- /dev/null
+++ b/aws-cpp-sdk-mturk-requester/source/model/HITAccessActions.cpp
@@ -0,0 +1,87 @@
+/*
+* Copyright 2010-2017 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.
+*/
+
+#include <aws/mturk-requester/model/HITAccessActions.h>
+#include <aws/core/utils/HashingUtils.h>
+#include <aws/core/Globals.h>
+#include <aws/core/utils/EnumParseOverflowContainer.h>
+
+using namespace Aws::Utils;
+
+
+namespace Aws
+{
+  namespace MTurk
+  {
+    namespace Model
+    {
+      namespace HITAccessActionsMapper
+      {
+
+        static const int Accept_HASH = HashingUtils::HashString("Accept");
+        static const int PreviewAndAccept_HASH = HashingUtils::HashString("PreviewAndAccept");
+        static const int DiscoverPreviewAndAccept_HASH = HashingUtils::HashString("DiscoverPreviewAndAccept");
+
+
+        HITAccessActions GetHITAccessActionsForName(const Aws::String& name)
+        {
+          int hashCode = HashingUtils::HashString(name.c_str());
+          if (hashCode == Accept_HASH)
+          {
+            return HITAccessActions::Accept;
+          }
+          else if (hashCode == PreviewAndAccept_HASH)
+          {
+            return HITAccessActions::PreviewAndAccept;
+          }
+          else if (hashCode == DiscoverPreviewAndAccept_HASH)
+          {
+            return HITAccessActions::DiscoverPreviewAndAccept;
+          }
+          EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+          if(overflowContainer)
+          {
+            overflowContainer->StoreOverflow(hashCode, name);
+            return static_cast<HITAccessActions>(hashCode);
+          }
+
+          return HITAccessActions::NOT_SET;
+        }
+
+        Aws::String GetNameForHITAccessActions(HITAccessActions enumValue)
+        {
+          switch(enumValue)
+          {
+          case HITAccessActions::Accept:
+            return "Accept";
+          case HITAccessActions::PreviewAndAccept:
+            return "PreviewAndAccept";
+          case HITAccessActions::DiscoverPreviewAndAccept:
+            return "DiscoverPreviewAndAccept";
+          default:
+            EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+            if(overflowContainer)
+            {
+              return overflowContainer->RetrieveOverflow(static_cast<int>(enumValue));
+            }
+
+            return "";
+          }
+        }
+
+      } // namespace HITAccessActionsMapper
+    } // namespace Model
+  } // namespace MTurk
+} // namespace Aws
diff --git a/aws-cpp-sdk-mturk-requester/source/model/QualificationRequirement.cpp b/aws-cpp-sdk-mturk-requester/source/model/QualificationRequirement.cpp
index 3a1f09bb021..ea8fe24e4ae 100644
--- a/aws-cpp-sdk-mturk-requester/source/model/QualificationRequirement.cpp
+++ b/aws-cpp-sdk-mturk-requester/source/model/QualificationRequirement.cpp
@@ -34,8 +34,8 @@ QualificationRequirement::QualificationRequirement() :
     m_comparatorHasBeenSet(false),
     m_integerValuesHasBeenSet(false),
     m_localeValuesHasBeenSet(false),
-    m_requiredToPreview(false),
-    m_requiredToPreviewHasBeenSet(false)
+    m_actionsGuarded(HITAccessActions::NOT_SET),
+    m_actionsGuardedHasBeenSet(false)
 {
 }
 
@@ -45,8 +45,8 @@ QualificationRequirement::QualificationRequirement(const JsonValue& jsonValue) :
     m_comparatorHasBeenSet(false),
     m_integerValuesHasBeenSet(false),
     m_localeValuesHasBeenSet(false),
-    m_requiredToPreview(false),
-    m_requiredToPreviewHasBeenSet(false)
+    m_actionsGuarded(HITAccessActions::NOT_SET),
+    m_actionsGuardedHasBeenSet(false)
 {
   *this = jsonValue;
 }
@@ -87,11 +87,11 @@ QualificationRequirement& QualificationRequirement::operator =(const JsonValue&
     m_localeValuesHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("RequiredToPreview"))
+  if(jsonValue.ValueExists("ActionsGuarded"))
   {
-    m_requiredToPreview = jsonValue.GetBool("RequiredToPreview");
+    m_actionsGuarded = HITAccessActionsMapper::GetHITAccessActionsForName(jsonValue.GetString("ActionsGuarded"));
 
-    m_requiredToPreviewHasBeenSet = true;
+    m_actionsGuardedHasBeenSet = true;
   }
 
   return *this;
@@ -134,10 +134,9 @@ JsonValue QualificationRequirement::Jsonize() const
 
   }
 
-  if(m_requiredToPreviewHasBeenSet)
+  if(m_actionsGuardedHasBeenSet)
   {
-   payload.WithBool("RequiredToPreview", m_requiredToPreview);
-
+   payload.WithString("ActionsGuarded", HITAccessActionsMapper::GetNameForHITAccessActions(m_actionsGuarded));
   }
 
   return payload;
diff --git a/aws-cpp-sdk-opsworks/nuget/aws-cpp-sdk-opsworks.autopkg b/aws-cpp-sdk-opsworks/nuget/aws-cpp-sdk-opsworks.autopkg
index a2e1ef80bc6..e04997a2b82 100644
--- a/aws-cpp-sdk-opsworks/nuget/aws-cpp-sdk-opsworks.autopkg
+++ b/aws-cpp-sdk-opsworks/nuget/aws-cpp-sdk-opsworks.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-OpsWorks;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20130218.23;
+        version : 1.4.20130218.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS OpsWorks);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-opsworkscm/nuget/aws-cpp-sdk-opsworkscm.autopkg b/aws-cpp-sdk-opsworkscm/nuget/aws-cpp-sdk-opsworkscm.autopkg
index 73e9697f07d..2a3ceebb0d9 100644
--- a/aws-cpp-sdk-opsworkscm/nuget/aws-cpp-sdk-opsworkscm.autopkg
+++ b/aws-cpp-sdk-opsworkscm/nuget/aws-cpp-sdk-opsworkscm.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-OpsWorksCM;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20161101.23;
+        version : 1.4.20161101.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS OpsWorks for Chef Automate);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-organizations/nuget/aws-cpp-sdk-organizations.autopkg b/aws-cpp-sdk-organizations/nuget/aws-cpp-sdk-organizations.autopkg
index 10fb02f666c..a339a314d20 100644
--- a/aws-cpp-sdk-organizations/nuget/aws-cpp-sdk-organizations.autopkg
+++ b/aws-cpp-sdk-organizations/nuget/aws-cpp-sdk-organizations.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Organizations;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20161128.23;
+        version : 1.4.20161128.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Organizations);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-pinpoint/nuget/aws-cpp-sdk-pinpoint.autopkg b/aws-cpp-sdk-pinpoint/nuget/aws-cpp-sdk-pinpoint.autopkg
index 4afad778194..a50fd43b066 100644
--- a/aws-cpp-sdk-pinpoint/nuget/aws-cpp-sdk-pinpoint.autopkg
+++ b/aws-cpp-sdk-pinpoint/nuget/aws-cpp-sdk-pinpoint.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Pinpoint;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20161201.23;
+        version : 1.4.20161201.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Pinpoint);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-polly/nuget/aws-cpp-sdk-polly.autopkg b/aws-cpp-sdk-polly/nuget/aws-cpp-sdk-polly.autopkg
index 7fabfe13aa7..ed54e2993a5 100644
--- a/aws-cpp-sdk-polly/nuget/aws-cpp-sdk-polly.autopkg
+++ b/aws-cpp-sdk-polly/nuget/aws-cpp-sdk-polly.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Polly;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20160610.23;
+        version : 1.4.20160610.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Polly);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-pricing/nuget/aws-cpp-sdk-pricing.autopkg b/aws-cpp-sdk-pricing/nuget/aws-cpp-sdk-pricing.autopkg
index 414fc1c5dd1..132fcb860d8 100644
--- a/aws-cpp-sdk-pricing/nuget/aws-cpp-sdk-pricing.autopkg
+++ b/aws-cpp-sdk-pricing/nuget/aws-cpp-sdk-pricing.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Pricing;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20171015.23;
+        version : 1.4.20171015.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Price List Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-queues/nuget/aws-cpp-sdk-queues.autopkg b/aws-cpp-sdk-queues/nuget/aws-cpp-sdk-queues.autopkg
index adaf5f35f67..c83b35944c4 100644
--- a/aws-cpp-sdk-queues/nuget/aws-cpp-sdk-queues.autopkg
+++ b/aws-cpp-sdk-queues/nuget/aws-cpp-sdk-queues.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Queues;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.23;
+        version : 1.4.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Queues);
@@ -48,8 +48,8 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23,
-            AWSSDKCPP-Sqs/1.4.20121105.23
+            AWSSDKCPP-Core/1.4.24,
+            AWSSDKCPP-Sqs/1.4.20121105.24
        }
     }
 
diff --git a/aws-cpp-sdk-rds/nuget/aws-cpp-sdk-rds.autopkg b/aws-cpp-sdk-rds/nuget/aws-cpp-sdk-rds.autopkg
index 9a183150344..3725e4dc046 100644
--- a/aws-cpp-sdk-rds/nuget/aws-cpp-sdk-rds.autopkg
+++ b/aws-cpp-sdk-rds/nuget/aws-cpp-sdk-rds.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-RDS;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20141031.23;
+        version : 1.4.20141031.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Relational Database Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-redshift/nuget/aws-cpp-sdk-redshift.autopkg b/aws-cpp-sdk-redshift/nuget/aws-cpp-sdk-redshift.autopkg
index b19a6b060b0..2ab031b2e6a 100644
--- a/aws-cpp-sdk-redshift/nuget/aws-cpp-sdk-redshift.autopkg
+++ b/aws-cpp-sdk-redshift/nuget/aws-cpp-sdk-redshift.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Redshift;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20121201.23;
+        version : 1.4.20121201.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Redshift);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-rekognition/nuget/aws-cpp-sdk-rekognition.autopkg b/aws-cpp-sdk-rekognition/nuget/aws-cpp-sdk-rekognition.autopkg
index acdb9fef333..33b08b6e613 100644
--- a/aws-cpp-sdk-rekognition/nuget/aws-cpp-sdk-rekognition.autopkg
+++ b/aws-cpp-sdk-rekognition/nuget/aws-cpp-sdk-rekognition.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Rekognition;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20160627.23;
+        version : 1.4.20160627.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Rekognition);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-resource-groups/nuget/aws-cpp-sdk-resource-groups.autopkg b/aws-cpp-sdk-resource-groups/nuget/aws-cpp-sdk-resource-groups.autopkg
index baa6185745d..0c1e5d2f81c 100644
--- a/aws-cpp-sdk-resource-groups/nuget/aws-cpp-sdk-resource-groups.autopkg
+++ b/aws-cpp-sdk-resource-groups/nuget/aws-cpp-sdk-resource-groups.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-ResourceGroups;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20171127.23;
+        version : 1.4.20171127.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Resource Groups);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-resourcegroupstaggingapi/nuget/aws-cpp-sdk-resourcegroupstaggingapi.autopkg b/aws-cpp-sdk-resourcegroupstaggingapi/nuget/aws-cpp-sdk-resourcegroupstaggingapi.autopkg
index 7d8377da3dd..873283eac8e 100644
--- a/aws-cpp-sdk-resourcegroupstaggingapi/nuget/aws-cpp-sdk-resourcegroupstaggingapi.autopkg
+++ b/aws-cpp-sdk-resourcegroupstaggingapi/nuget/aws-cpp-sdk-resourcegroupstaggingapi.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-ResourceGroupsTaggingAPI;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170126.23;
+        version : 1.4.20170126.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Resource Groups Tagging API);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-route53/nuget/aws-cpp-sdk-route53.autopkg b/aws-cpp-sdk-route53/nuget/aws-cpp-sdk-route53.autopkg
index 33813e57a8b..eab59f4c024 100644
--- a/aws-cpp-sdk-route53/nuget/aws-cpp-sdk-route53.autopkg
+++ b/aws-cpp-sdk-route53/nuget/aws-cpp-sdk-route53.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Route53;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20130401.23;
+        version : 1.4.20130401.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Route 53);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-route53domains/nuget/aws-cpp-sdk-route53domains.autopkg b/aws-cpp-sdk-route53domains/nuget/aws-cpp-sdk-route53domains.autopkg
index 0f5a4096adc..7c6ea9ddfd7 100644
--- a/aws-cpp-sdk-route53domains/nuget/aws-cpp-sdk-route53domains.autopkg
+++ b/aws-cpp-sdk-route53domains/nuget/aws-cpp-sdk-route53domains.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Route53Domains;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20140515.23;
+        version : 1.4.20140515.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Route 53 Domains);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-s3-encryption/nuget/aws-cpp-sdk-s3-encryption.autopkg b/aws-cpp-sdk-s3-encryption/nuget/aws-cpp-sdk-s3-encryption.autopkg
index ab815501ed0..57f47d142f7 100644
--- a/aws-cpp-sdk-s3-encryption/nuget/aws-cpp-sdk-s3-encryption.autopkg
+++ b/aws-cpp-sdk-s3-encryption/nuget/aws-cpp-sdk-s3-encryption.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-S3-Encryption;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.23;
+        version : 1.4.24;
 
         // Display name for package.
         title: AWS SDK for C++ (S3 Encryption Client);
@@ -48,9 +48,9 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23,
-            AWSSDKCPP-S3/1.4.20060301.23,
-            AWSSDKCPP-KMS/1.4.20141101.23
+            AWSSDKCPP-Core/1.4.24,
+            AWSSDKCPP-S3/1.4.20060301.24,
+            AWSSDKCPP-KMS/1.4.20141101.24
        }
     }
 
diff --git a/aws-cpp-sdk-s3/nuget/aws-cpp-sdk-s3.autopkg b/aws-cpp-sdk-s3/nuget/aws-cpp-sdk-s3.autopkg
index 0ebe1a67d2e..a9917912b92 100644
--- a/aws-cpp-sdk-s3/nuget/aws-cpp-sdk-s3.autopkg
+++ b/aws-cpp-sdk-s3/nuget/aws-cpp-sdk-s3.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-S3;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20060301.23;
+        version : 1.4.20060301.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Simple Storage Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-sagemaker-runtime/nuget/aws-cpp-sdk-sagemaker-runtime.autopkg b/aws-cpp-sdk-sagemaker-runtime/nuget/aws-cpp-sdk-sagemaker-runtime.autopkg
index 33a215c47d7..5eb9bd23b48 100644
--- a/aws-cpp-sdk-sagemaker-runtime/nuget/aws-cpp-sdk-sagemaker-runtime.autopkg
+++ b/aws-cpp-sdk-sagemaker-runtime/nuget/aws-cpp-sdk-sagemaker-runtime.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-SageMakerRuntime;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170513.23;
+        version : 1.4.20170513.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon SageMaker Runtime);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-sagemaker/nuget/aws-cpp-sdk-sagemaker.autopkg b/aws-cpp-sdk-sagemaker/nuget/aws-cpp-sdk-sagemaker.autopkg
index c880c6f34f2..1e4ecdce5e9 100644
--- a/aws-cpp-sdk-sagemaker/nuget/aws-cpp-sdk-sagemaker.autopkg
+++ b/aws-cpp-sdk-sagemaker/nuget/aws-cpp-sdk-sagemaker.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-SageMaker;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170724.23;
+        version : 1.4.20170724.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon SageMaker Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-sdb/nuget/aws-cpp-sdk-sdb.autopkg b/aws-cpp-sdk-sdb/nuget/aws-cpp-sdk-sdb.autopkg
index 5d7d73df18d..61389bb30ab 100644
--- a/aws-cpp-sdk-sdb/nuget/aws-cpp-sdk-sdb.autopkg
+++ b/aws-cpp-sdk-sdb/nuget/aws-cpp-sdk-sdb.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-SimpleDB;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20090415.23;
+        version : 1.4.20090415.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon SimpleDB);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-serverlessrepo/nuget/aws-cpp-sdk-serverlessrepo.autopkg b/aws-cpp-sdk-serverlessrepo/nuget/aws-cpp-sdk-serverlessrepo.autopkg
index 9ff0c56615d..40dcb3545ce 100644
--- a/aws-cpp-sdk-serverlessrepo/nuget/aws-cpp-sdk-serverlessrepo.autopkg
+++ b/aws-cpp-sdk-serverlessrepo/nuget/aws-cpp-sdk-serverlessrepo.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-ServerlessApplicationRepository;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170908.23;
+        version : 1.4.20170908.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWSServerlessApplicationRepository);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-servicecatalog/nuget/aws-cpp-sdk-servicecatalog.autopkg b/aws-cpp-sdk-servicecatalog/nuget/aws-cpp-sdk-servicecatalog.autopkg
index c98ea578d4c..ac1686292a0 100644
--- a/aws-cpp-sdk-servicecatalog/nuget/aws-cpp-sdk-servicecatalog.autopkg
+++ b/aws-cpp-sdk-servicecatalog/nuget/aws-cpp-sdk-servicecatalog.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-ServiceCatalog;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20151210.23;
+        version : 1.4.20151210.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Service Catalog);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-servicediscovery/nuget/aws-cpp-sdk-servicediscovery.autopkg b/aws-cpp-sdk-servicediscovery/nuget/aws-cpp-sdk-servicediscovery.autopkg
index 0896c05f538..1795d91c3b0 100644
--- a/aws-cpp-sdk-servicediscovery/nuget/aws-cpp-sdk-servicediscovery.autopkg
+++ b/aws-cpp-sdk-servicediscovery/nuget/aws-cpp-sdk-servicediscovery.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-ServiceDiscovery;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170314.23;
+        version : 1.4.20170314.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Route 53 Auto Naming);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-shield/nuget/aws-cpp-sdk-shield.autopkg b/aws-cpp-sdk-shield/nuget/aws-cpp-sdk-shield.autopkg
index 1adbcae7f36..d815af93db5 100644
--- a/aws-cpp-sdk-shield/nuget/aws-cpp-sdk-shield.autopkg
+++ b/aws-cpp-sdk-shield/nuget/aws-cpp-sdk-shield.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Shield;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20160602.23;
+        version : 1.4.20160602.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Shield);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-sms/nuget/aws-cpp-sdk-sms.autopkg b/aws-cpp-sdk-sms/nuget/aws-cpp-sdk-sms.autopkg
index 78b7df7461d..807f69b28b2 100644
--- a/aws-cpp-sdk-sms/nuget/aws-cpp-sdk-sms.autopkg
+++ b/aws-cpp-sdk-sms/nuget/aws-cpp-sdk-sms.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-SMS;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20161024.23;
+        version : 1.4.20161024.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Server Migration Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-snowball/nuget/aws-cpp-sdk-snowball.autopkg b/aws-cpp-sdk-snowball/nuget/aws-cpp-sdk-snowball.autopkg
index d07a99891df..e383b81b933 100644
--- a/aws-cpp-sdk-snowball/nuget/aws-cpp-sdk-snowball.autopkg
+++ b/aws-cpp-sdk-snowball/nuget/aws-cpp-sdk-snowball.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Snowball;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20160630.23;
+        version : 1.4.20160630.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Import/Export Snowball);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-sns/nuget/aws-cpp-sdk-sns.autopkg b/aws-cpp-sdk-sns/nuget/aws-cpp-sdk-sns.autopkg
index 12235008bad..bd0bea5c180 100644
--- a/aws-cpp-sdk-sns/nuget/aws-cpp-sdk-sns.autopkg
+++ b/aws-cpp-sdk-sns/nuget/aws-cpp-sdk-sns.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-SNS;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20100331.23;
+        version : 1.4.20100331.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Simple Notification Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-sqs/nuget/aws-cpp-sdk-sqs.autopkg b/aws-cpp-sdk-sqs/nuget/aws-cpp-sdk-sqs.autopkg
index adef2f845e2..3817d1fa612 100644
--- a/aws-cpp-sdk-sqs/nuget/aws-cpp-sdk-sqs.autopkg
+++ b/aws-cpp-sdk-sqs/nuget/aws-cpp-sdk-sqs.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-SQS;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20121105.23;
+        version : 1.4.20121105.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Simple Queue Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-ssm/nuget/aws-cpp-sdk-ssm.autopkg b/aws-cpp-sdk-ssm/nuget/aws-cpp-sdk-ssm.autopkg
index 83162f03a25..440fceffbb1 100644
--- a/aws-cpp-sdk-ssm/nuget/aws-cpp-sdk-ssm.autopkg
+++ b/aws-cpp-sdk-ssm/nuget/aws-cpp-sdk-ssm.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-SSM;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20141106.23;
+        version : 1.4.20141106.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Simple Systems Manager (SSM));
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-states/nuget/aws-cpp-sdk-states.autopkg b/aws-cpp-sdk-states/nuget/aws-cpp-sdk-states.autopkg
index 21d35b1f2cc..b03a0e9999c 100644
--- a/aws-cpp-sdk-states/nuget/aws-cpp-sdk-states.autopkg
+++ b/aws-cpp-sdk-states/nuget/aws-cpp-sdk-states.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-SFN;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20161123.23;
+        version : 1.4.20161123.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Step Functions);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-storagegateway/nuget/aws-cpp-sdk-storagegateway.autopkg b/aws-cpp-sdk-storagegateway/nuget/aws-cpp-sdk-storagegateway.autopkg
index fb04130797d..f45e27a0c9a 100644
--- a/aws-cpp-sdk-storagegateway/nuget/aws-cpp-sdk-storagegateway.autopkg
+++ b/aws-cpp-sdk-storagegateway/nuget/aws-cpp-sdk-storagegateway.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-StorageGateway;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20130630.23;
+        version : 1.4.20130630.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Storage Gateway);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-sts/include/aws/sts/STSClient.h b/aws-cpp-sdk-sts/include/aws/sts/STSClient.h
index 937a7fbd3a5..5f54b549c6b 100644
--- a/aws-cpp-sdk-sts/include/aws/sts/STSClient.h
+++ b/aws-cpp-sdk-sts/include/aws/sts/STSClient.h
@@ -223,24 +223,35 @@ namespace Model
          * user. With those temporary security credentials, you construct a sign-in URL
          * that users can use to access the console. For more information, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp.html#sts-introduction">Common
-         * Scenarios for Temporary Credentials</a> in the <i>IAM User Guide</i>.</p> <p>The
-         * temporary security credentials are valid for the duration that you specified
-         * when calling <code>AssumeRole</code>, which can be from 900 seconds (15 minutes)
-         * to a maximum of 3600 seconds (1 hour). The default is 1 hour. </p> <p>The
-         * temporary security credentials created by <code>AssumeRole</code> can be used to
-         * make API calls to any AWS service with the following exception: you cannot call
-         * the STS service's <code>GetFederationToken</code> or
-         * <code>GetSessionToken</code> APIs.</p> <p>Optionally, you can pass an IAM access
-         * policy to this operation. If you choose not to pass a policy, the temporary
-         * security credentials that are returned by the operation have the permissions
-         * that are defined in the access policy of the role that is being assumed. If you
-         * pass a policy to this operation, the temporary security credentials that are
-         * returned by the operation have the permissions that are allowed by both the
-         * access policy of the role that is being assumed, <i> <b>and</b> </i> the policy
-         * that you pass. This gives you a way to further restrict the permissions for the
-         * resulting temporary security credentials. You cannot use the passed policy to
-         * grant permissions that are in excess of those allowed by the access policy of
-         * the role that is being assumed. For more information, see <a
+         * Scenarios for Temporary Credentials</a> in the <i>IAM User Guide</i>.</p> <p>By
+         * default, the temporary security credentials created by <code>AssumeRole</code>
+         * last for one hour. However, you can use the optional
+         * <code>DurationSeconds</code> parameter to specify the duration of your session.
+         * You can provide a value from 900 seconds (15 minutes) up to the maximum session
+         * duration setting for the role. This setting can have a value from 1 hour to 12
+         * hours. To learn how to view the maximum value for your role, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session">View
+         * the Maximum Session Duration Setting for a Role</a> in the <i>IAM User
+         * Guide</i>. The maximum session duration limit applies when you use the
+         * <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI
+         * operations but does not apply when you use those operations to create a console
+         * URL. For more information, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html">Using
+         * IAM Roles</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security
+         * credentials created by <code>AssumeRole</code> can be used to make API calls to
+         * any AWS service with the following exception: you cannot call the STS service's
+         * <code>GetFederationToken</code> or <code>GetSessionToken</code> APIs.</p>
+         * <p>Optionally, you can pass an IAM access policy to this operation. If you
+         * choose not to pass a policy, the temporary security credentials that are
+         * returned by the operation have the permissions that are defined in the access
+         * policy of the role that is being assumed. If you pass a policy to this
+         * operation, the temporary security credentials that are returned by the operation
+         * have the permissions that are allowed by both the access policy of the role that
+         * is being assumed, <i> <b>and</b> </i> the policy that you pass. This gives you a
+         * way to further restrict the permissions for the resulting temporary security
+         * credentials. You cannot use the passed policy to grant permissions that are in
+         * excess of those allowed by the access policy of the role that is being assumed.
+         * For more information, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_assumerole.html">Permissions
          * for AssumeRole, AssumeRoleWithSAML, and AssumeRoleWithWebIdentity</a> in the
          * <i>IAM User Guide</i>.</p> <p>To assume a role, your AWS account must be trusted
@@ -313,24 +324,35 @@ namespace Model
          * user. With those temporary security credentials, you construct a sign-in URL
          * that users can use to access the console. For more information, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp.html#sts-introduction">Common
-         * Scenarios for Temporary Credentials</a> in the <i>IAM User Guide</i>.</p> <p>The
-         * temporary security credentials are valid for the duration that you specified
-         * when calling <code>AssumeRole</code>, which can be from 900 seconds (15 minutes)
-         * to a maximum of 3600 seconds (1 hour). The default is 1 hour. </p> <p>The
-         * temporary security credentials created by <code>AssumeRole</code> can be used to
-         * make API calls to any AWS service with the following exception: you cannot call
-         * the STS service's <code>GetFederationToken</code> or
-         * <code>GetSessionToken</code> APIs.</p> <p>Optionally, you can pass an IAM access
-         * policy to this operation. If you choose not to pass a policy, the temporary
-         * security credentials that are returned by the operation have the permissions
-         * that are defined in the access policy of the role that is being assumed. If you
-         * pass a policy to this operation, the temporary security credentials that are
-         * returned by the operation have the permissions that are allowed by both the
-         * access policy of the role that is being assumed, <i> <b>and</b> </i> the policy
-         * that you pass. This gives you a way to further restrict the permissions for the
-         * resulting temporary security credentials. You cannot use the passed policy to
-         * grant permissions that are in excess of those allowed by the access policy of
-         * the role that is being assumed. For more information, see <a
+         * Scenarios for Temporary Credentials</a> in the <i>IAM User Guide</i>.</p> <p>By
+         * default, the temporary security credentials created by <code>AssumeRole</code>
+         * last for one hour. However, you can use the optional
+         * <code>DurationSeconds</code> parameter to specify the duration of your session.
+         * You can provide a value from 900 seconds (15 minutes) up to the maximum session
+         * duration setting for the role. This setting can have a value from 1 hour to 12
+         * hours. To learn how to view the maximum value for your role, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session">View
+         * the Maximum Session Duration Setting for a Role</a> in the <i>IAM User
+         * Guide</i>. The maximum session duration limit applies when you use the
+         * <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI
+         * operations but does not apply when you use those operations to create a console
+         * URL. For more information, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html">Using
+         * IAM Roles</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security
+         * credentials created by <code>AssumeRole</code> can be used to make API calls to
+         * any AWS service with the following exception: you cannot call the STS service's
+         * <code>GetFederationToken</code> or <code>GetSessionToken</code> APIs.</p>
+         * <p>Optionally, you can pass an IAM access policy to this operation. If you
+         * choose not to pass a policy, the temporary security credentials that are
+         * returned by the operation have the permissions that are defined in the access
+         * policy of the role that is being assumed. If you pass a policy to this
+         * operation, the temporary security credentials that are returned by the operation
+         * have the permissions that are allowed by both the access policy of the role that
+         * is being assumed, <i> <b>and</b> </i> the policy that you pass. This gives you a
+         * way to further restrict the permissions for the resulting temporary security
+         * credentials. You cannot use the passed policy to grant permissions that are in
+         * excess of those allowed by the access policy of the role that is being assumed.
+         * For more information, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_assumerole.html">Permissions
          * for AssumeRole, AssumeRoleWithSAML, and AssumeRoleWithWebIdentity</a> in the
          * <i>IAM User Guide</i>.</p> <p>To assume a role, your AWS account must be trusted
@@ -405,24 +427,35 @@ namespace Model
          * user. With those temporary security credentials, you construct a sign-in URL
          * that users can use to access the console. For more information, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp.html#sts-introduction">Common
-         * Scenarios for Temporary Credentials</a> in the <i>IAM User Guide</i>.</p> <p>The
-         * temporary security credentials are valid for the duration that you specified
-         * when calling <code>AssumeRole</code>, which can be from 900 seconds (15 minutes)
-         * to a maximum of 3600 seconds (1 hour). The default is 1 hour. </p> <p>The
-         * temporary security credentials created by <code>AssumeRole</code> can be used to
-         * make API calls to any AWS service with the following exception: you cannot call
-         * the STS service's <code>GetFederationToken</code> or
-         * <code>GetSessionToken</code> APIs.</p> <p>Optionally, you can pass an IAM access
-         * policy to this operation. If you choose not to pass a policy, the temporary
-         * security credentials that are returned by the operation have the permissions
-         * that are defined in the access policy of the role that is being assumed. If you
-         * pass a policy to this operation, the temporary security credentials that are
-         * returned by the operation have the permissions that are allowed by both the
-         * access policy of the role that is being assumed, <i> <b>and</b> </i> the policy
-         * that you pass. This gives you a way to further restrict the permissions for the
-         * resulting temporary security credentials. You cannot use the passed policy to
-         * grant permissions that are in excess of those allowed by the access policy of
-         * the role that is being assumed. For more information, see <a
+         * Scenarios for Temporary Credentials</a> in the <i>IAM User Guide</i>.</p> <p>By
+         * default, the temporary security credentials created by <code>AssumeRole</code>
+         * last for one hour. However, you can use the optional
+         * <code>DurationSeconds</code> parameter to specify the duration of your session.
+         * You can provide a value from 900 seconds (15 minutes) up to the maximum session
+         * duration setting for the role. This setting can have a value from 1 hour to 12
+         * hours. To learn how to view the maximum value for your role, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session">View
+         * the Maximum Session Duration Setting for a Role</a> in the <i>IAM User
+         * Guide</i>. The maximum session duration limit applies when you use the
+         * <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI
+         * operations but does not apply when you use those operations to create a console
+         * URL. For more information, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html">Using
+         * IAM Roles</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security
+         * credentials created by <code>AssumeRole</code> can be used to make API calls to
+         * any AWS service with the following exception: you cannot call the STS service's
+         * <code>GetFederationToken</code> or <code>GetSessionToken</code> APIs.</p>
+         * <p>Optionally, you can pass an IAM access policy to this operation. If you
+         * choose not to pass a policy, the temporary security credentials that are
+         * returned by the operation have the permissions that are defined in the access
+         * policy of the role that is being assumed. If you pass a policy to this
+         * operation, the temporary security credentials that are returned by the operation
+         * have the permissions that are allowed by both the access policy of the role that
+         * is being assumed, <i> <b>and</b> </i> the policy that you pass. This gives you a
+         * way to further restrict the permissions for the resulting temporary security
+         * credentials. You cannot use the passed policy to grant permissions that are in
+         * excess of those allowed by the access policy of the role that is being assumed.
+         * For more information, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_assumerole.html">Permissions
          * for AssumeRole, AssumeRoleWithSAML, and AssumeRoleWithWebIdentity</a> in the
          * <i>IAM User Guide</i>.</p> <p>To assume a role, your AWS account must be trusted
@@ -478,17 +511,29 @@ namespace Model
          * the AWS STS APIs</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security
          * credentials returned by this operation consist of an access key ID, a secret
          * access key, and a security token. Applications can use these temporary security
-         * credentials to sign calls to AWS services.</p> <p>The temporary security
-         * credentials are valid for the duration that you specified when calling
-         * <code>AssumeRole</code>, or until the time specified in the SAML authentication
-         * response's <code>SessionNotOnOrAfter</code> value, whichever is shorter. The
-         * duration can be from 900 seconds (15 minutes) to a maximum of 3600 seconds (1
-         * hour). The default is 1 hour.</p> <p>The temporary security credentials created
-         * by <code>AssumeRoleWithSAML</code> can be used to make API calls to any AWS
-         * service with the following exception: you cannot call the STS service's
-         * <code>GetFederationToken</code> or <code>GetSessionToken</code> APIs.</p>
-         * <p>Optionally, you can pass an IAM access policy to this operation. If you
-         * choose not to pass a policy, the temporary security credentials that are
+         * credentials to sign calls to AWS services.</p> <p>By default, the temporary
+         * security credentials created by <code>AssumeRoleWithSAML</code> last for one
+         * hour. However, you can use the optional <code>DurationSeconds</code> parameter
+         * to specify the duration of your session. Your role session lasts for the
+         * duration that you specify, or until the time specified in the SAML
+         * authentication response's <code>SessionNotOnOrAfter</code> value, whichever is
+         * shorter. You can provide a <code>DurationSeconds</code> value from 900 seconds
+         * (15 minutes) up to the maximum session duration setting for the role. This
+         * setting can have a value from 1 hour to 12 hours. To learn how to view the
+         * maximum value for your role, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session">View
+         * the Maximum Session Duration Setting for a Role</a> in the <i>IAM User
+         * Guide</i>. The maximum session duration limit applies when you use the
+         * <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI
+         * operations but does not apply when you use those operations to create a console
+         * URL. For more information, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html">Using
+         * IAM Roles</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security
+         * credentials created by <code>AssumeRoleWithSAML</code> can be used to make API
+         * calls to any AWS service with the following exception: you cannot call the STS
+         * service's <code>GetFederationToken</code> or <code>GetSessionToken</code>
+         * APIs.</p> <p>Optionally, you can pass an IAM access policy to this operation. If
+         * you choose not to pass a policy, the temporary security credentials that are
          * returned by the operation have the permissions that are defined in the access
          * policy of the role that is being assumed. If you pass a policy to this
          * operation, the temporary security credentials that are returned by the operation
@@ -547,17 +592,29 @@ namespace Model
          * the AWS STS APIs</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security
          * credentials returned by this operation consist of an access key ID, a secret
          * access key, and a security token. Applications can use these temporary security
-         * credentials to sign calls to AWS services.</p> <p>The temporary security
-         * credentials are valid for the duration that you specified when calling
-         * <code>AssumeRole</code>, or until the time specified in the SAML authentication
-         * response's <code>SessionNotOnOrAfter</code> value, whichever is shorter. The
-         * duration can be from 900 seconds (15 minutes) to a maximum of 3600 seconds (1
-         * hour). The default is 1 hour.</p> <p>The temporary security credentials created
-         * by <code>AssumeRoleWithSAML</code> can be used to make API calls to any AWS
-         * service with the following exception: you cannot call the STS service's
-         * <code>GetFederationToken</code> or <code>GetSessionToken</code> APIs.</p>
-         * <p>Optionally, you can pass an IAM access policy to this operation. If you
-         * choose not to pass a policy, the temporary security credentials that are
+         * credentials to sign calls to AWS services.</p> <p>By default, the temporary
+         * security credentials created by <code>AssumeRoleWithSAML</code> last for one
+         * hour. However, you can use the optional <code>DurationSeconds</code> parameter
+         * to specify the duration of your session. Your role session lasts for the
+         * duration that you specify, or until the time specified in the SAML
+         * authentication response's <code>SessionNotOnOrAfter</code> value, whichever is
+         * shorter. You can provide a <code>DurationSeconds</code> value from 900 seconds
+         * (15 minutes) up to the maximum session duration setting for the role. This
+         * setting can have a value from 1 hour to 12 hours. To learn how to view the
+         * maximum value for your role, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session">View
+         * the Maximum Session Duration Setting for a Role</a> in the <i>IAM User
+         * Guide</i>. The maximum session duration limit applies when you use the
+         * <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI
+         * operations but does not apply when you use those operations to create a console
+         * URL. For more information, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html">Using
+         * IAM Roles</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security
+         * credentials created by <code>AssumeRoleWithSAML</code> can be used to make API
+         * calls to any AWS service with the following exception: you cannot call the STS
+         * service's <code>GetFederationToken</code> or <code>GetSessionToken</code>
+         * APIs.</p> <p>Optionally, you can pass an IAM access policy to this operation. If
+         * you choose not to pass a policy, the temporary security credentials that are
          * returned by the operation have the permissions that are defined in the access
          * policy of the role that is being assumed. If you pass a policy to this
          * operation, the temporary security credentials that are returned by the operation
@@ -618,17 +675,29 @@ namespace Model
          * the AWS STS APIs</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security
          * credentials returned by this operation consist of an access key ID, a secret
          * access key, and a security token. Applications can use these temporary security
-         * credentials to sign calls to AWS services.</p> <p>The temporary security
-         * credentials are valid for the duration that you specified when calling
-         * <code>AssumeRole</code>, or until the time specified in the SAML authentication
-         * response's <code>SessionNotOnOrAfter</code> value, whichever is shorter. The
-         * duration can be from 900 seconds (15 minutes) to a maximum of 3600 seconds (1
-         * hour). The default is 1 hour.</p> <p>The temporary security credentials created
-         * by <code>AssumeRoleWithSAML</code> can be used to make API calls to any AWS
-         * service with the following exception: you cannot call the STS service's
-         * <code>GetFederationToken</code> or <code>GetSessionToken</code> APIs.</p>
-         * <p>Optionally, you can pass an IAM access policy to this operation. If you
-         * choose not to pass a policy, the temporary security credentials that are
+         * credentials to sign calls to AWS services.</p> <p>By default, the temporary
+         * security credentials created by <code>AssumeRoleWithSAML</code> last for one
+         * hour. However, you can use the optional <code>DurationSeconds</code> parameter
+         * to specify the duration of your session. Your role session lasts for the
+         * duration that you specify, or until the time specified in the SAML
+         * authentication response's <code>SessionNotOnOrAfter</code> value, whichever is
+         * shorter. You can provide a <code>DurationSeconds</code> value from 900 seconds
+         * (15 minutes) up to the maximum session duration setting for the role. This
+         * setting can have a value from 1 hour to 12 hours. To learn how to view the
+         * maximum value for your role, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session">View
+         * the Maximum Session Duration Setting for a Role</a> in the <i>IAM User
+         * Guide</i>. The maximum session duration limit applies when you use the
+         * <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI
+         * operations but does not apply when you use those operations to create a console
+         * URL. For more information, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html">Using
+         * IAM Roles</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security
+         * credentials created by <code>AssumeRoleWithSAML</code> can be used to make API
+         * calls to any AWS service with the following exception: you cannot call the STS
+         * service's <code>GetFederationToken</code> or <code>GetSessionToken</code>
+         * APIs.</p> <p>Optionally, you can pass an IAM access policy to this operation. If
+         * you choose not to pass a policy, the temporary security credentials that are
          * returned by the operation have the permissions that are defined in the access
          * policy of the role that is being assumed. If you pass a policy to this
          * operation, the temporary security credentials that are returned by the operation
@@ -705,25 +774,35 @@ namespace Model
          * the AWS STS APIs</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security
          * credentials returned by this API consist of an access key ID, a secret access
          * key, and a security token. Applications can use these temporary security
-         * credentials to sign calls to AWS service APIs.</p> <p>The credentials are valid
-         * for the duration that you specified when calling
-         * <code>AssumeRoleWithWebIdentity</code>, which can be from 900 seconds (15
-         * minutes) to a maximum of 3600 seconds (1 hour). The default is 1 hour. </p>
-         * <p>The temporary security credentials created by
-         * <code>AssumeRoleWithWebIdentity</code> can be used to make API calls to any AWS
-         * service with the following exception: you cannot call the STS service's
-         * <code>GetFederationToken</code> or <code>GetSessionToken</code> APIs.</p>
-         * <p>Optionally, you can pass an IAM access policy to this operation. If you
-         * choose not to pass a policy, the temporary security credentials that are
-         * returned by the operation have the permissions that are defined in the access
-         * policy of the role that is being assumed. If you pass a policy to this
-         * operation, the temporary security credentials that are returned by the operation
-         * have the permissions that are allowed by both the access policy of the role that
-         * is being assumed, <i> <b>and</b> </i> the policy that you pass. This gives you a
-         * way to further restrict the permissions for the resulting temporary security
-         * credentials. You cannot use the passed policy to grant permissions that are in
-         * excess of those allowed by the access policy of the role that is being assumed.
-         * For more information, see <a
+         * credentials to sign calls to AWS service APIs.</p> <p>By default, the temporary
+         * security credentials created by <code>AssumeRoleWithWebIdentity</code> last for
+         * one hour. However, you can use the optional <code>DurationSeconds</code>
+         * parameter to specify the duration of your session. You can provide a value from
+         * 900 seconds (15 minutes) up to the maximum session duration setting for the
+         * role. This setting can have a value from 1 hour to 12 hours. To learn how to
+         * view the maximum value for your role, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session">View
+         * the Maximum Session Duration Setting for a Role</a> in the <i>IAM User
+         * Guide</i>. The maximum session duration limit applies when you use the
+         * <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI
+         * operations but does not apply when you use those operations to create a console
+         * URL. For more information, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html">Using
+         * IAM Roles</a> in the <i>IAM User Guide</i>. </p> <p>The temporary security
+         * credentials created by <code>AssumeRoleWithWebIdentity</code> can be used to
+         * make API calls to any AWS service with the following exception: you cannot call
+         * the STS service's <code>GetFederationToken</code> or
+         * <code>GetSessionToken</code> APIs.</p> <p>Optionally, you can pass an IAM access
+         * policy to this operation. If you choose not to pass a policy, the temporary
+         * security credentials that are returned by the operation have the permissions
+         * that are defined in the access policy of the role that is being assumed. If you
+         * pass a policy to this operation, the temporary security credentials that are
+         * returned by the operation have the permissions that are allowed by both the
+         * access policy of the role that is being assumed, <i> <b>and</b> </i> the policy
+         * that you pass. This gives you a way to further restrict the permissions for the
+         * resulting temporary security credentials. You cannot use the passed policy to
+         * grant permissions that are in excess of those allowed by the access policy of
+         * the role that is being assumed. For more information, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_assumerole.html">Permissions
          * for AssumeRole, AssumeRoleWithSAML, and AssumeRoleWithWebIdentity</a> in the
          * <i>IAM User Guide</i>.</p> <p>Before your application can call
@@ -796,25 +875,35 @@ namespace Model
          * the AWS STS APIs</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security
          * credentials returned by this API consist of an access key ID, a secret access
          * key, and a security token. Applications can use these temporary security
-         * credentials to sign calls to AWS service APIs.</p> <p>The credentials are valid
-         * for the duration that you specified when calling
-         * <code>AssumeRoleWithWebIdentity</code>, which can be from 900 seconds (15
-         * minutes) to a maximum of 3600 seconds (1 hour). The default is 1 hour. </p>
-         * <p>The temporary security credentials created by
-         * <code>AssumeRoleWithWebIdentity</code> can be used to make API calls to any AWS
-         * service with the following exception: you cannot call the STS service's
-         * <code>GetFederationToken</code> or <code>GetSessionToken</code> APIs.</p>
-         * <p>Optionally, you can pass an IAM access policy to this operation. If you
-         * choose not to pass a policy, the temporary security credentials that are
-         * returned by the operation have the permissions that are defined in the access
-         * policy of the role that is being assumed. If you pass a policy to this
-         * operation, the temporary security credentials that are returned by the operation
-         * have the permissions that are allowed by both the access policy of the role that
-         * is being assumed, <i> <b>and</b> </i> the policy that you pass. This gives you a
-         * way to further restrict the permissions for the resulting temporary security
-         * credentials. You cannot use the passed policy to grant permissions that are in
-         * excess of those allowed by the access policy of the role that is being assumed.
-         * For more information, see <a
+         * credentials to sign calls to AWS service APIs.</p> <p>By default, the temporary
+         * security credentials created by <code>AssumeRoleWithWebIdentity</code> last for
+         * one hour. However, you can use the optional <code>DurationSeconds</code>
+         * parameter to specify the duration of your session. You can provide a value from
+         * 900 seconds (15 minutes) up to the maximum session duration setting for the
+         * role. This setting can have a value from 1 hour to 12 hours. To learn how to
+         * view the maximum value for your role, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session">View
+         * the Maximum Session Duration Setting for a Role</a> in the <i>IAM User
+         * Guide</i>. The maximum session duration limit applies when you use the
+         * <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI
+         * operations but does not apply when you use those operations to create a console
+         * URL. For more information, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html">Using
+         * IAM Roles</a> in the <i>IAM User Guide</i>. </p> <p>The temporary security
+         * credentials created by <code>AssumeRoleWithWebIdentity</code> can be used to
+         * make API calls to any AWS service with the following exception: you cannot call
+         * the STS service's <code>GetFederationToken</code> or
+         * <code>GetSessionToken</code> APIs.</p> <p>Optionally, you can pass an IAM access
+         * policy to this operation. If you choose not to pass a policy, the temporary
+         * security credentials that are returned by the operation have the permissions
+         * that are defined in the access policy of the role that is being assumed. If you
+         * pass a policy to this operation, the temporary security credentials that are
+         * returned by the operation have the permissions that are allowed by both the
+         * access policy of the role that is being assumed, <i> <b>and</b> </i> the policy
+         * that you pass. This gives you a way to further restrict the permissions for the
+         * resulting temporary security credentials. You cannot use the passed policy to
+         * grant permissions that are in excess of those allowed by the access policy of
+         * the role that is being assumed. For more information, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_assumerole.html">Permissions
          * for AssumeRole, AssumeRoleWithSAML, and AssumeRoleWithWebIdentity</a> in the
          * <i>IAM User Guide</i>.</p> <p>Before your application can call
@@ -889,25 +978,35 @@ namespace Model
          * the AWS STS APIs</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security
          * credentials returned by this API consist of an access key ID, a secret access
          * key, and a security token. Applications can use these temporary security
-         * credentials to sign calls to AWS service APIs.</p> <p>The credentials are valid
-         * for the duration that you specified when calling
-         * <code>AssumeRoleWithWebIdentity</code>, which can be from 900 seconds (15
-         * minutes) to a maximum of 3600 seconds (1 hour). The default is 1 hour. </p>
-         * <p>The temporary security credentials created by
-         * <code>AssumeRoleWithWebIdentity</code> can be used to make API calls to any AWS
-         * service with the following exception: you cannot call the STS service's
-         * <code>GetFederationToken</code> or <code>GetSessionToken</code> APIs.</p>
-         * <p>Optionally, you can pass an IAM access policy to this operation. If you
-         * choose not to pass a policy, the temporary security credentials that are
-         * returned by the operation have the permissions that are defined in the access
-         * policy of the role that is being assumed. If you pass a policy to this
-         * operation, the temporary security credentials that are returned by the operation
-         * have the permissions that are allowed by both the access policy of the role that
-         * is being assumed, <i> <b>and</b> </i> the policy that you pass. This gives you a
-         * way to further restrict the permissions for the resulting temporary security
-         * credentials. You cannot use the passed policy to grant permissions that are in
-         * excess of those allowed by the access policy of the role that is being assumed.
-         * For more information, see <a
+         * credentials to sign calls to AWS service APIs.</p> <p>By default, the temporary
+         * security credentials created by <code>AssumeRoleWithWebIdentity</code> last for
+         * one hour. However, you can use the optional <code>DurationSeconds</code>
+         * parameter to specify the duration of your session. You can provide a value from
+         * 900 seconds (15 minutes) up to the maximum session duration setting for the
+         * role. This setting can have a value from 1 hour to 12 hours. To learn how to
+         * view the maximum value for your role, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session">View
+         * the Maximum Session Duration Setting for a Role</a> in the <i>IAM User
+         * Guide</i>. The maximum session duration limit applies when you use the
+         * <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI
+         * operations but does not apply when you use those operations to create a console
+         * URL. For more information, see <a
+         * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html">Using
+         * IAM Roles</a> in the <i>IAM User Guide</i>. </p> <p>The temporary security
+         * credentials created by <code>AssumeRoleWithWebIdentity</code> can be used to
+         * make API calls to any AWS service with the following exception: you cannot call
+         * the STS service's <code>GetFederationToken</code> or
+         * <code>GetSessionToken</code> APIs.</p> <p>Optionally, you can pass an IAM access
+         * policy to this operation. If you choose not to pass a policy, the temporary
+         * security credentials that are returned by the operation have the permissions
+         * that are defined in the access policy of the role that is being assumed. If you
+         * pass a policy to this operation, the temporary security credentials that are
+         * returned by the operation have the permissions that are allowed by both the
+         * access policy of the role that is being assumed, <i> <b>and</b> </i> the policy
+         * that you pass. This gives you a way to further restrict the permissions for the
+         * resulting temporary security credentials. You cannot use the passed policy to
+         * grant permissions that are in excess of those allowed by the access policy of
+         * the role that is being assumed. For more information, see <a
          * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_assumerole.html">Permissions
          * for AssumeRole, AssumeRoleWithSAML, and AssumeRoleWithWebIdentity</a> in the
          * <i>IAM User Guide</i>.</p> <p>Before your application can call
diff --git a/aws-cpp-sdk-sts/include/aws/sts/model/AssumeRoleRequest.h b/aws-cpp-sdk-sts/include/aws/sts/model/AssumeRoleRequest.h
index c06f3a3916f..d1865130201 100644
--- a/aws-cpp-sdk-sts/include/aws/sts/model/AssumeRoleRequest.h
+++ b/aws-cpp-sdk-sts/include/aws/sts/model/AssumeRoleRequest.h
@@ -359,13 +359,20 @@ namespace Model
 
     /**
      * <p>The duration, in seconds, of the role session. The value can range from 900
-     * seconds (15 minutes) to 3600 seconds (1 hour). By default, the value is set to
-     * 3600 seconds.</p> <note> <p>This is separate from the duration of a console
-     * session that you might request using the returned credentials. The request to
-     * the federation endpoint for a console sign-in token takes a
+     * seconds (15 minutes) up to the maximum session duration setting for the role.
+     * This setting can have a value from 1 hour to 12 hours. If you specify a value
+     * higher than this setting, the operation fails. For example, if you specify a
+     * session duration of 12 hours, but your administrator set the maximum session
+     * duration to 6 hours, your operation fails. To learn how to view the maximum
+     * value for your role, see <a
+     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session">View
+     * the Maximum Session Duration Setting for a Role</a> in the <i>IAM User
+     * Guide</i>.</p> <p>By default, the value is set to 3600 seconds. </p> <note>
+     * <p>The <code>DurationSeconds</code> parameter is separate from the duration of a
+     * console session that you might request using the returned credentials. The
+     * request to the federation endpoint for a console sign-in token takes a
      * <code>SessionDuration</code> parameter that specifies the maximum length of the
-     * console session, separately from the <code>DurationSeconds</code> parameter on
-     * this API. For more information, see <a
+     * console session. For more information, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html">Creating
      * a URL that Enables Federated Users to Access the AWS Management Console</a> in
      * the <i>IAM User Guide</i>.</p> </note>
@@ -374,13 +381,20 @@ namespace Model
 
     /**
      * <p>The duration, in seconds, of the role session. The value can range from 900
-     * seconds (15 minutes) to 3600 seconds (1 hour). By default, the value is set to
-     * 3600 seconds.</p> <note> <p>This is separate from the duration of a console
-     * session that you might request using the returned credentials. The request to
-     * the federation endpoint for a console sign-in token takes a
+     * seconds (15 minutes) up to the maximum session duration setting for the role.
+     * This setting can have a value from 1 hour to 12 hours. If you specify a value
+     * higher than this setting, the operation fails. For example, if you specify a
+     * session duration of 12 hours, but your administrator set the maximum session
+     * duration to 6 hours, your operation fails. To learn how to view the maximum
+     * value for your role, see <a
+     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session">View
+     * the Maximum Session Duration Setting for a Role</a> in the <i>IAM User
+     * Guide</i>.</p> <p>By default, the value is set to 3600 seconds. </p> <note>
+     * <p>The <code>DurationSeconds</code> parameter is separate from the duration of a
+     * console session that you might request using the returned credentials. The
+     * request to the federation endpoint for a console sign-in token takes a
      * <code>SessionDuration</code> parameter that specifies the maximum length of the
-     * console session, separately from the <code>DurationSeconds</code> parameter on
-     * this API. For more information, see <a
+     * console session. For more information, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html">Creating
      * a URL that Enables Federated Users to Access the AWS Management Console</a> in
      * the <i>IAM User Guide</i>.</p> </note>
@@ -389,13 +403,20 @@ namespace Model
 
     /**
      * <p>The duration, in seconds, of the role session. The value can range from 900
-     * seconds (15 minutes) to 3600 seconds (1 hour). By default, the value is set to
-     * 3600 seconds.</p> <note> <p>This is separate from the duration of a console
-     * session that you might request using the returned credentials. The request to
-     * the federation endpoint for a console sign-in token takes a
+     * seconds (15 minutes) up to the maximum session duration setting for the role.
+     * This setting can have a value from 1 hour to 12 hours. If you specify a value
+     * higher than this setting, the operation fails. For example, if you specify a
+     * session duration of 12 hours, but your administrator set the maximum session
+     * duration to 6 hours, your operation fails. To learn how to view the maximum
+     * value for your role, see <a
+     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session">View
+     * the Maximum Session Duration Setting for a Role</a> in the <i>IAM User
+     * Guide</i>.</p> <p>By default, the value is set to 3600 seconds. </p> <note>
+     * <p>The <code>DurationSeconds</code> parameter is separate from the duration of a
+     * console session that you might request using the returned credentials. The
+     * request to the federation endpoint for a console sign-in token takes a
      * <code>SessionDuration</code> parameter that specifies the maximum length of the
-     * console session, separately from the <code>DurationSeconds</code> parameter on
-     * this API. For more information, see <a
+     * console session. For more information, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html">Creating
      * a URL that Enables Federated Users to Access the AWS Management Console</a> in
      * the <i>IAM User Guide</i>.</p> </note>
diff --git a/aws-cpp-sdk-sts/include/aws/sts/model/AssumeRoleWithSAMLRequest.h b/aws-cpp-sdk-sts/include/aws/sts/model/AssumeRoleWithSAMLRequest.h
index ac10ca4fb61..850b95fd7a9 100644
--- a/aws-cpp-sdk-sts/include/aws/sts/model/AssumeRoleWithSAMLRequest.h
+++ b/aws-cpp-sdk-sts/include/aws/sts/model/AssumeRoleWithSAMLRequest.h
@@ -352,53 +352,77 @@ namespace Model
 
 
     /**
-     * <p>The duration, in seconds, of the role session. The value can range from 900
-     * seconds (15 minutes) to 3600 seconds (1 hour). By default, the value is set to
-     * 3600 seconds. An expiration can also be specified in the SAML authentication
-     * response's <code>SessionNotOnOrAfter</code> value. The actual expiration time is
-     * whichever value is shorter. </p> <note> <p>This is separate from the duration of
-     * a console session that you might request using the returned credentials. The
+     * <p>The duration, in seconds, of the role session. Your role session lasts for
+     * the duration that you specify for the <code>DurationSeconds</code> parameter, or
+     * until the time specified in the SAML authentication response's
+     * <code>SessionNotOnOrAfter</code> value, whichever is shorter. You can provide a
+     * <code>DurationSeconds</code> value from 900 seconds (15 minutes) up to the
+     * maximum session duration setting for the role. This setting can have a value
+     * from 1 hour to 12 hours. If you specify a value higher than this setting, the
+     * operation fails. For example, if you specify a session duration of 12 hours, but
+     * your administrator set the maximum session duration to 6 hours, your operation
+     * fails. To learn how to view the maximum value for your role, see <a
+     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session">View
+     * the Maximum Session Duration Setting for a Role</a> in the <i>IAM User
+     * Guide</i>.</p> <p>By default, the value is set to 3600 seconds. </p> <note>
+     * <p>The <code>DurationSeconds</code> parameter is separate from the duration of a
+     * console session that you might request using the returned credentials. The
      * request to the federation endpoint for a console sign-in token takes a
      * <code>SessionDuration</code> parameter that specifies the maximum length of the
-     * console session, separately from the <code>DurationSeconds</code> parameter on
-     * this API. For more information, see <a
-     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-saml.html">Enabling
-     * SAML 2.0 Federated Users to Access the AWS Management Console</a> in the <i>IAM
-     * User Guide</i>.</p> </note>
+     * console session. For more information, see <a
+     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html">Creating
+     * a URL that Enables Federated Users to Access the AWS Management Console</a> in
+     * the <i>IAM User Guide</i>.</p> </note>
      */
     inline int GetDurationSeconds() const{ return m_durationSeconds; }
 
     /**
-     * <p>The duration, in seconds, of the role session. The value can range from 900
-     * seconds (15 minutes) to 3600 seconds (1 hour). By default, the value is set to
-     * 3600 seconds. An expiration can also be specified in the SAML authentication
-     * response's <code>SessionNotOnOrAfter</code> value. The actual expiration time is
-     * whichever value is shorter. </p> <note> <p>This is separate from the duration of
-     * a console session that you might request using the returned credentials. The
+     * <p>The duration, in seconds, of the role session. Your role session lasts for
+     * the duration that you specify for the <code>DurationSeconds</code> parameter, or
+     * until the time specified in the SAML authentication response's
+     * <code>SessionNotOnOrAfter</code> value, whichever is shorter. You can provide a
+     * <code>DurationSeconds</code> value from 900 seconds (15 minutes) up to the
+     * maximum session duration setting for the role. This setting can have a value
+     * from 1 hour to 12 hours. If you specify a value higher than this setting, the
+     * operation fails. For example, if you specify a session duration of 12 hours, but
+     * your administrator set the maximum session duration to 6 hours, your operation
+     * fails. To learn how to view the maximum value for your role, see <a
+     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session">View
+     * the Maximum Session Duration Setting for a Role</a> in the <i>IAM User
+     * Guide</i>.</p> <p>By default, the value is set to 3600 seconds. </p> <note>
+     * <p>The <code>DurationSeconds</code> parameter is separate from the duration of a
+     * console session that you might request using the returned credentials. The
      * request to the federation endpoint for a console sign-in token takes a
      * <code>SessionDuration</code> parameter that specifies the maximum length of the
-     * console session, separately from the <code>DurationSeconds</code> parameter on
-     * this API. For more information, see <a
-     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-saml.html">Enabling
-     * SAML 2.0 Federated Users to Access the AWS Management Console</a> in the <i>IAM
-     * User Guide</i>.</p> </note>
+     * console session. For more information, see <a
+     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html">Creating
+     * a URL that Enables Federated Users to Access the AWS Management Console</a> in
+     * the <i>IAM User Guide</i>.</p> </note>
      */
     inline void SetDurationSeconds(int value) { m_durationSecondsHasBeenSet = true; m_durationSeconds = value; }
 
     /**
-     * <p>The duration, in seconds, of the role session. The value can range from 900
-     * seconds (15 minutes) to 3600 seconds (1 hour). By default, the value is set to
-     * 3600 seconds. An expiration can also be specified in the SAML authentication
-     * response's <code>SessionNotOnOrAfter</code> value. The actual expiration time is
-     * whichever value is shorter. </p> <note> <p>This is separate from the duration of
-     * a console session that you might request using the returned credentials. The
+     * <p>The duration, in seconds, of the role session. Your role session lasts for
+     * the duration that you specify for the <code>DurationSeconds</code> parameter, or
+     * until the time specified in the SAML authentication response's
+     * <code>SessionNotOnOrAfter</code> value, whichever is shorter. You can provide a
+     * <code>DurationSeconds</code> value from 900 seconds (15 minutes) up to the
+     * maximum session duration setting for the role. This setting can have a value
+     * from 1 hour to 12 hours. If you specify a value higher than this setting, the
+     * operation fails. For example, if you specify a session duration of 12 hours, but
+     * your administrator set the maximum session duration to 6 hours, your operation
+     * fails. To learn how to view the maximum value for your role, see <a
+     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session">View
+     * the Maximum Session Duration Setting for a Role</a> in the <i>IAM User
+     * Guide</i>.</p> <p>By default, the value is set to 3600 seconds. </p> <note>
+     * <p>The <code>DurationSeconds</code> parameter is separate from the duration of a
+     * console session that you might request using the returned credentials. The
      * request to the federation endpoint for a console sign-in token takes a
      * <code>SessionDuration</code> parameter that specifies the maximum length of the
-     * console session, separately from the <code>DurationSeconds</code> parameter on
-     * this API. For more information, see <a
-     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-saml.html">Enabling
-     * SAML 2.0 Federated Users to Access the AWS Management Console</a> in the <i>IAM
-     * User Guide</i>.</p> </note>
+     * console session. For more information, see <a
+     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html">Creating
+     * a URL that Enables Federated Users to Access the AWS Management Console</a> in
+     * the <i>IAM User Guide</i>.</p> </note>
      */
     inline AssumeRoleWithSAMLRequest& WithDurationSeconds(int value) { SetDurationSeconds(value); return *this;}
 
diff --git a/aws-cpp-sdk-sts/include/aws/sts/model/AssumeRoleWithWebIdentityRequest.h b/aws-cpp-sdk-sts/include/aws/sts/model/AssumeRoleWithWebIdentityRequest.h
index da40e77f73f..584a923c206 100644
--- a/aws-cpp-sdk-sts/include/aws/sts/model/AssumeRoleWithWebIdentityRequest.h
+++ b/aws-cpp-sdk-sts/include/aws/sts/model/AssumeRoleWithWebIdentityRequest.h
@@ -459,13 +459,20 @@ namespace Model
 
     /**
      * <p>The duration, in seconds, of the role session. The value can range from 900
-     * seconds (15 minutes) to 3600 seconds (1 hour). By default, the value is set to
-     * 3600 seconds.</p> <note> <p>This is separate from the duration of a console
-     * session that you might request using the returned credentials. The request to
-     * the federation endpoint for a console sign-in token takes a
+     * seconds (15 minutes) up to the maximum session duration setting for the role.
+     * This setting can have a value from 1 hour to 12 hours. If you specify a value
+     * higher than this setting, the operation fails. For example, if you specify a
+     * session duration of 12 hours, but your administrator set the maximum session
+     * duration to 6 hours, your operation fails. To learn how to view the maximum
+     * value for your role, see <a
+     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session">View
+     * the Maximum Session Duration Setting for a Role</a> in the <i>IAM User
+     * Guide</i>.</p> <p>By default, the value is set to 3600 seconds. </p> <note>
+     * <p>The <code>DurationSeconds</code> parameter is separate from the duration of a
+     * console session that you might request using the returned credentials. The
+     * request to the federation endpoint for a console sign-in token takes a
      * <code>SessionDuration</code> parameter that specifies the maximum length of the
-     * console session, separately from the <code>DurationSeconds</code> parameter on
-     * this API. For more information, see <a
+     * console session. For more information, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html">Creating
      * a URL that Enables Federated Users to Access the AWS Management Console</a> in
      * the <i>IAM User Guide</i>.</p> </note>
@@ -474,13 +481,20 @@ namespace Model
 
     /**
      * <p>The duration, in seconds, of the role session. The value can range from 900
-     * seconds (15 minutes) to 3600 seconds (1 hour). By default, the value is set to
-     * 3600 seconds.</p> <note> <p>This is separate from the duration of a console
-     * session that you might request using the returned credentials. The request to
-     * the federation endpoint for a console sign-in token takes a
+     * seconds (15 minutes) up to the maximum session duration setting for the role.
+     * This setting can have a value from 1 hour to 12 hours. If you specify a value
+     * higher than this setting, the operation fails. For example, if you specify a
+     * session duration of 12 hours, but your administrator set the maximum session
+     * duration to 6 hours, your operation fails. To learn how to view the maximum
+     * value for your role, see <a
+     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session">View
+     * the Maximum Session Duration Setting for a Role</a> in the <i>IAM User
+     * Guide</i>.</p> <p>By default, the value is set to 3600 seconds. </p> <note>
+     * <p>The <code>DurationSeconds</code> parameter is separate from the duration of a
+     * console session that you might request using the returned credentials. The
+     * request to the federation endpoint for a console sign-in token takes a
      * <code>SessionDuration</code> parameter that specifies the maximum length of the
-     * console session, separately from the <code>DurationSeconds</code> parameter on
-     * this API. For more information, see <a
+     * console session. For more information, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html">Creating
      * a URL that Enables Federated Users to Access the AWS Management Console</a> in
      * the <i>IAM User Guide</i>.</p> </note>
@@ -489,13 +503,20 @@ namespace Model
 
     /**
      * <p>The duration, in seconds, of the role session. The value can range from 900
-     * seconds (15 minutes) to 3600 seconds (1 hour). By default, the value is set to
-     * 3600 seconds.</p> <note> <p>This is separate from the duration of a console
-     * session that you might request using the returned credentials. The request to
-     * the federation endpoint for a console sign-in token takes a
+     * seconds (15 minutes) up to the maximum session duration setting for the role.
+     * This setting can have a value from 1 hour to 12 hours. If you specify a value
+     * higher than this setting, the operation fails. For example, if you specify a
+     * session duration of 12 hours, but your administrator set the maximum session
+     * duration to 6 hours, your operation fails. To learn how to view the maximum
+     * value for your role, see <a
+     * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session">View
+     * the Maximum Session Duration Setting for a Role</a> in the <i>IAM User
+     * Guide</i>.</p> <p>By default, the value is set to 3600 seconds. </p> <note>
+     * <p>The <code>DurationSeconds</code> parameter is separate from the duration of a
+     * console session that you might request using the returned credentials. The
+     * request to the federation endpoint for a console sign-in token takes a
      * <code>SessionDuration</code> parameter that specifies the maximum length of the
-     * console session, separately from the <code>DurationSeconds</code> parameter on
-     * this API. For more information, see <a
+     * console session. For more information, see <a
      * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html">Creating
      * a URL that Enables Federated Users to Access the AWS Management Console</a> in
      * the <i>IAM User Guide</i>.</p> </note>
diff --git a/aws-cpp-sdk-sts/nuget/aws-cpp-sdk-sts.autopkg b/aws-cpp-sdk-sts/nuget/aws-cpp-sdk-sts.autopkg
index d76b5b9eeea..e2eaa2f6868 100644
--- a/aws-cpp-sdk-sts/nuget/aws-cpp-sdk-sts.autopkg
+++ b/aws-cpp-sdk-sts/nuget/aws-cpp-sdk-sts.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-STS;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20110615.23;
+        version : 1.4.20110615.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Security Token Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-support/nuget/aws-cpp-sdk-support.autopkg b/aws-cpp-sdk-support/nuget/aws-cpp-sdk-support.autopkg
index e6c3f814c93..fedba405f46 100644
--- a/aws-cpp-sdk-support/nuget/aws-cpp-sdk-support.autopkg
+++ b/aws-cpp-sdk-support/nuget/aws-cpp-sdk-support.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Support;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20130415.23;
+        version : 1.4.20130415.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS Support);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-swf/nuget/aws-cpp-sdk-swf.autopkg b/aws-cpp-sdk-swf/nuget/aws-cpp-sdk-swf.autopkg
index b561d199caf..7d959df7c76 100644
--- a/aws-cpp-sdk-swf/nuget/aws-cpp-sdk-swf.autopkg
+++ b/aws-cpp-sdk-swf/nuget/aws-cpp-sdk-swf.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-SWF;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20120125.23;
+        version : 1.4.20120125.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Simple Workflow Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-text-to-speech/nuget/aws-cpp-sdk-text-to-speech.autopkg b/aws-cpp-sdk-text-to-speech/nuget/aws-cpp-sdk-text-to-speech.autopkg
index 5fa8890f6e6..941f0a7fe24 100644
--- a/aws-cpp-sdk-text-to-speech/nuget/aws-cpp-sdk-text-to-speech.autopkg
+++ b/aws-cpp-sdk-text-to-speech/nuget/aws-cpp-sdk-text-to-speech.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Text-To-Speech;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.23;
+        version : 1.4.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Text-To-Speech);
@@ -48,8 +48,8 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23,
-            AWSSDKCPP-Polly/1.4.20160610.23
+            AWSSDKCPP-Core/1.4.24,
+            AWSSDKCPP-Polly/1.4.20160610.24
        }
     }
 
diff --git a/aws-cpp-sdk-transcribe/nuget/aws-cpp-sdk-transcribe.autopkg b/aws-cpp-sdk-transcribe/nuget/aws-cpp-sdk-transcribe.autopkg
index eb1cb73bbd4..4bb9f53be91 100644
--- a/aws-cpp-sdk-transcribe/nuget/aws-cpp-sdk-transcribe.autopkg
+++ b/aws-cpp-sdk-transcribe/nuget/aws-cpp-sdk-transcribe.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-TranscribeService;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20171026.23;
+        version : 1.4.20171026.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Transcribe Service);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-transfer/nuget/aws-cpp-sdk-transfer.autopkg b/aws-cpp-sdk-transfer/nuget/aws-cpp-sdk-transfer.autopkg
index af903d0c8a0..50dc3b3e4ee 100644
--- a/aws-cpp-sdk-transfer/nuget/aws-cpp-sdk-transfer.autopkg
+++ b/aws-cpp-sdk-transfer/nuget/aws-cpp-sdk-transfer.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Transfer;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.23;
+        version : 1.4.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Transfer Manager);
@@ -48,8 +48,8 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23,
-            AWSSDKCPP-S3/1.4.20060301.23
+            AWSSDKCPP-Core/1.4.24,
+            AWSSDKCPP-S3/1.4.20060301.24
        }
     }
 
diff --git a/aws-cpp-sdk-translate/nuget/aws-cpp-sdk-translate.autopkg b/aws-cpp-sdk-translate/nuget/aws-cpp-sdk-translate.autopkg
index a8954ce6275..15885e7f175 100644
--- a/aws-cpp-sdk-translate/nuget/aws-cpp-sdk-translate.autopkg
+++ b/aws-cpp-sdk-translate/nuget/aws-cpp-sdk-translate.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Translate;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20170701.23;
+        version : 1.4.20170701.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon Translate);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-waf-regional/nuget/aws-cpp-sdk-waf-regional.autopkg b/aws-cpp-sdk-waf-regional/nuget/aws-cpp-sdk-waf-regional.autopkg
index 690d69f0aea..6c8129bb59a 100644
--- a/aws-cpp-sdk-waf-regional/nuget/aws-cpp-sdk-waf-regional.autopkg
+++ b/aws-cpp-sdk-waf-regional/nuget/aws-cpp-sdk-waf-regional.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-WAFRegional;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20161128.23;
+        version : 1.4.20161128.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS WAF Regional);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-waf/nuget/aws-cpp-sdk-waf.autopkg b/aws-cpp-sdk-waf/nuget/aws-cpp-sdk-waf.autopkg
index 40967e125cd..3cff6aa5300 100644
--- a/aws-cpp-sdk-waf/nuget/aws-cpp-sdk-waf.autopkg
+++ b/aws-cpp-sdk-waf/nuget/aws-cpp-sdk-waf.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-WAF;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20150824.23;
+        version : 1.4.20150824.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS WAF);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-workdocs/nuget/aws-cpp-sdk-workdocs.autopkg b/aws-cpp-sdk-workdocs/nuget/aws-cpp-sdk-workdocs.autopkg
index 104f5e30115..2a6aed5db7d 100644
--- a/aws-cpp-sdk-workdocs/nuget/aws-cpp-sdk-workdocs.autopkg
+++ b/aws-cpp-sdk-workdocs/nuget/aws-cpp-sdk-workdocs.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-WorkDocs;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20160501.23;
+        version : 1.4.20160501.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon WorkDocs);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-workmail/nuget/aws-cpp-sdk-workmail.autopkg b/aws-cpp-sdk-workmail/nuget/aws-cpp-sdk-workmail.autopkg
index 6ad3f840627..1fd18dbfeaf 100644
--- a/aws-cpp-sdk-workmail/nuget/aws-cpp-sdk-workmail.autopkg
+++ b/aws-cpp-sdk-workmail/nuget/aws-cpp-sdk-workmail.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-WorkMail;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20171001.23;
+        version : 1.4.20171001.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon WorkMail);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-workspaces/nuget/aws-cpp-sdk-workspaces.autopkg b/aws-cpp-sdk-workspaces/nuget/aws-cpp-sdk-workspaces.autopkg
index 4d37c9afa98..2954241a48c 100644
--- a/aws-cpp-sdk-workspaces/nuget/aws-cpp-sdk-workspaces.autopkg
+++ b/aws-cpp-sdk-workspaces/nuget/aws-cpp-sdk-workspaces.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-WorkSpaces;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20150408.23;
+        version : 1.4.20150408.24;
 
         // Display name for package.
         title: AWS SDK for C++ (Amazon WorkSpaces);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/aws-cpp-sdk-xray/nuget/aws-cpp-sdk-xray.autopkg b/aws-cpp-sdk-xray/nuget/aws-cpp-sdk-xray.autopkg
index 963741f7368..786a9639521 100644
--- a/aws-cpp-sdk-xray/nuget/aws-cpp-sdk-xray.autopkg
+++ b/aws-cpp-sdk-xray/nuget/aws-cpp-sdk-xray.autopkg
@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-XRay;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 1.4.20160412.23;
+        version : 1.4.20160412.24;
 
         // Display name for package.
         title: AWS SDK for C++ (AWS X-Ray);
@@ -48,7 +48,7 @@ nuget {
 
     dependencies {
        packages: {
-            AWSSDKCPP-Core/1.4.23
+            AWSSDKCPP-Core/1.4.24
        }
     }
 
diff --git a/code-generation/api-descriptions/iam-2010-05-08.normal.json b/code-generation/api-descriptions/iam-2010-05-08.normal.json
index 10afd344a64..4159d8b66c4 100644
--- a/code-generation/api-descriptions/iam-2010-05-08.normal.json
+++ b/code-generation/api-descriptions/iam-2010-05-08.normal.json
@@ -7,6 +7,7 @@
     "protocol":"query",
     "serviceAbbreviation":"IAM",
     "serviceFullName":"AWS Identity and Access Management",
+    "serviceId":"IAM",
     "signatureVersion":"v4",
     "uid":"iam-2010-05-08",
     "xmlNamespace":"https://iam.amazonaws.com/doc/2010-05-08/"
@@ -25,7 +26,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Adds a new client ID (also known as audience) to the list of client IDs already registered for the specified IAM OpenID Connect (OIDC) provider resource.</p> <p>This action is idempotent; it does not fail or return an error if you add an existing client ID to the provider.</p>"
+      "documentation":"<p>Adds a new client ID (also known as audience) to the list of client IDs already registered for the specified IAM OpenID Connect (OIDC) provider resource.</p> <p>This operation is idempotent; it does not fail or return an error if you add an existing client ID to the provider.</p>"
     },
     "AddRoleToInstanceProfile":{
       "name":"AddRoleToInstanceProfile",
@@ -41,7 +42,7 @@
         {"shape":"UnmodifiableEntityException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Adds the specified IAM role to the specified instance profile. An instance profile can contain only one role, and this limit cannot be increased.</p> <note> <p>The caller of this API must be granted the <code>PassRole</code> permission on the IAM role by a permission policy.</p> </note> <p>For more information about roles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html\">Working with Roles</a>. For more information about instance profiles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html\">About Instance Profiles</a>.</p>"
+      "documentation":"<p>Adds the specified IAM role to the specified instance profile. An instance profile can contain only one role, and this limit cannot be increased. You can remove the existing role and then add a different role to an instance profile. You must then wait for the change to appear across all of AWS because of <a href=\"https://en.wikipedia.org/wiki/Eventual_consistency\">eventual consistency</a>. To force the change, you must <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DisassociateIamInstanceProfile.html\">disassociate the instance profile</a> and then <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_AssociateIamInstanceProfile.html\">associate the instance profile</a>, or you can stop your instance and then restart it.</p> <note> <p>The caller of this API must be granted the <code>PassRole</code> permission on the IAM role by a permission policy.</p> </note> <p>For more information about roles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html\">Working with Roles</a>. For more information about instance profiles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html\">About Instance Profiles</a>.</p>"
     },
     "AddUserToGroup":{
       "name":"AddUserToGroup",
@@ -121,7 +122,7 @@
         {"shape":"PasswordPolicyViolationException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Changes the password of the IAM user who is calling this action. The root account password is not affected by this action.</p> <p>To change the password for a different user, see <a>UpdateLoginProfile</a>. For more information about modifying passwords, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_ManagingLogins.html\">Managing Passwords</a> in the <i>IAM User Guide</i>.</p>"
+      "documentation":"<p>Changes the password of the IAM user who is calling this operation. The AWS account root user password is not affected by this operation.</p> <p>To change the password for a different user, see <a>UpdateLoginProfile</a>. For more information about modifying passwords, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_ManagingLogins.html\">Managing Passwords</a> in the <i>IAM User Guide</i>.</p>"
     },
     "CreateAccessKey":{
       "name":"CreateAccessKey",
@@ -139,7 +140,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p> Creates a new AWS secret access key and corresponding AWS access key ID for the specified user. The default status for new keys is <code>Active</code>.</p> <p>If you do not specify a user name, IAM determines the user name implicitly based on the AWS access key ID signing the request. Because this action works for access keys under the AWS account, you can use this action to manage root credentials even if the AWS account has no associated users.</p> <p> For information about limits on the number of keys you can create, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/LimitationsOnEntities.html\">Limitations on IAM Entities</a> in the <i>IAM User Guide</i>.</p> <important> <p>To ensure the security of your AWS account, the secret access key is accessible only during key and user creation. You must save the key (for example, in a text file) if you want to be able to access it again. If a secret key is lost, you can delete the access keys for the associated user and then create new keys.</p> </important>"
+      "documentation":"<p> Creates a new AWS secret access key and corresponding AWS access key ID for the specified user. The default status for new keys is <code>Active</code>.</p> <p>If you do not specify a user name, IAM determines the user name implicitly based on the AWS access key ID signing the request. Because this operation works for access keys under the AWS account, you can use this operation to manage AWS account root user credentials. This is true even if the AWS account has no associated users.</p> <p> For information about limits on the number of keys you can create, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/LimitationsOnEntities.html\">Limitations on IAM Entities</a> in the <i>IAM User Guide</i>.</p> <important> <p>To ensure the security of your AWS account, the secret access key is accessible only during key and user creation. You must save the key (for example, in a text file) if you want to be able to access it again. If a secret key is lost, you can delete the access keys for the associated user and then create new keys.</p> </important>"
     },
     "CreateAccountAlias":{
       "name":"CreateAccountAlias",
@@ -229,7 +230,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Creates an IAM entity to describe an identity provider (IdP) that supports <a href=\"http://openid.net/connect/\">OpenID Connect (OIDC)</a>.</p> <p>The OIDC provider that you create with this operation can be used as a principal in a role's trust policy to establish a trust relationship between AWS and the OIDC provider.</p> <p>When you create the IAM OIDC provider, you specify the URL of the OIDC identity provider (IdP) to trust, a list of client IDs (also known as audiences) that identify the application or applications that are allowed to authenticate using the OIDC provider, and a list of thumbprints of the server certificate(s) that the IdP uses. You get all of this information from the OIDC IdP that you want to use for access to AWS.</p> <note> <p>Because trust for the OIDC provider is ultimately derived from the IAM provider that this action creates, it is a best practice to limit access to the <a>CreateOpenIDConnectProvider</a> action to highly-privileged users.</p> </note>"
+      "documentation":"<p>Creates an IAM entity to describe an identity provider (IdP) that supports <a href=\"http://openid.net/connect/\">OpenID Connect (OIDC)</a>.</p> <p>The OIDC provider that you create with this operation can be used as a principal in a role's trust policy. Such a policy establishes a trust relationship between AWS and the OIDC provider.</p> <p>When you create the IAM OIDC provider, you specify the following:</p> <ul> <li> <p>The URL of the OIDC identity provider (IdP) to trust</p> </li> <li> <p>A list of client IDs (also known as audiences) that identify the application or applications that are allowed to authenticate using the OIDC provider</p> </li> <li> <p>A list of thumbprints of the server certificate(s) that the IdP uses.</p> </li> </ul> <p>You get all of this information from the OIDC IdP that you want to use to access AWS.</p> <note> <p>Because trust for the OIDC provider is derived from the IAM provider that this operation creates, it is best to limit access to the <a>CreateOpenIDConnectProvider</a> operation to highly privileged users.</p> </note>"
     },
     "CreatePolicy":{
       "name":"CreatePolicy",
@@ -289,7 +290,7 @@
         {"shape":"MalformedPolicyDocumentException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Creates a new role for your AWS account. For more information about roles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html\">Working with Roles</a>. For information about limitations on role names and the number of roles you can create, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/LimitationsOnEntities.html\">Limitations on IAM Entities</a> in the <i>IAM User Guide</i>.</p>"
+      "documentation":"<p>Creates a new role for your AWS account. For more information about roles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html\">IAM Roles</a>. For information about limitations on role names and the number of roles you can create, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/LimitationsOnEntities.html\">Limitations on IAM Entities</a> in the <i>IAM User Guide</i>.</p>"
     },
     "CreateSAMLProvider":{
       "name":"CreateSAMLProvider",
@@ -308,7 +309,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Creates an IAM resource that describes an identity provider (IdP) that supports SAML 2.0.</p> <p>The SAML provider resource that you create with this operation can be used as a principal in an IAM role's trust policy to enable federated users who sign-in using the SAML IdP to assume the role. You can create an IAM role that supports Web-based single sign-on (SSO) to the AWS Management Console or one that supports API access to AWS.</p> <p>When you create the SAML provider resource, you upload an a SAML metadata document that you get from your IdP and that includes the issuer's name, expiration information, and keys that can be used to validate the SAML authentication response (assertions) that the IdP sends. You must generate the metadata document using the identity management software that is used as your organization's IdP.</p> <note> <p> This operation requires <a href=\"http://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\">Signature Version 4</a>.</p> </note> <p> For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-saml.html\">Enabling SAML 2.0 Federated Users to Access the AWS Management Console</a> and <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_saml.html\">About SAML 2.0-based Federation</a> in the <i>IAM User Guide</i>.</p>"
+      "documentation":"<p>Creates an IAM resource that describes an identity provider (IdP) that supports SAML 2.0.</p> <p>The SAML provider resource that you create with this operation can be used as a principal in an IAM role's trust policy. Such a policy can enable federated users who sign-in using the SAML IdP to assume the role. You can create an IAM role that supports Web-based single sign-on (SSO) to the AWS Management Console or one that supports API access to AWS.</p> <p>When you create the SAML provider resource, you upload a SAML metadata document that you get from your IdP. That document includes the issuer's name, expiration information, and keys that can be used to validate the SAML authentication response (assertions) that the IdP sends. You must generate the metadata document using the identity management software that is used as your organization's IdP.</p> <note> <p> This operation requires <a href=\"http://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\">Signature Version 4</a>.</p> </note> <p> For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-saml.html\">Enabling SAML 2.0 Federated Users to Access the AWS Management Console</a> and <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_saml.html\">About SAML 2.0-based Federation</a> in the <i>IAM User Guide</i>.</p>"
     },
     "CreateServiceLinkedRole":{
       "name":"CreateServiceLinkedRole",
@@ -327,7 +328,7 @@
         {"shape":"NoSuchEntityException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Creates an IAM role that is linked to a specific AWS service. The service controls the attached policies and when the role can be deleted. This helps ensure that the service is not broken by an unexpectedly changed or deleted role, which could put your AWS resources into an unknown state. Allowing the service to control the role helps improve service stability and proper cleanup when a service and its role are no longer needed.</p> <p>The name of the role is autogenerated by combining the string that you specify for the <code>AWSServiceName</code> parameter with the string that you specify for the <code>CustomSuffix</code> parameter. The resulting name must be unique in your account or the request fails.</p> <p>To attach a policy to this service-linked role, you must make the request using the AWS service that depends on this role.</p>"
+      "documentation":"<p>Creates an IAM role that is linked to a specific AWS service. The service controls the attached policies and when the role can be deleted. This helps ensure that the service is not broken by an unexpectedly changed or deleted role, which could put your AWS resources into an unknown state. Allowing the service to control the role helps improve service stability and proper cleanup when a service and its role are no longer needed.</p> <p>The name of the role is generated by combining the string that you specify for the <code>AWSServiceName</code> parameter with the string that you specify for the <code>CustomSuffix</code> parameter. The resulting name must be unique in your account or the request fails.</p> <p>To attach a policy to this service-linked role, you must make the request using the AWS service that depends on this role.</p>"
     },
     "CreateServiceSpecificCredential":{
       "name":"CreateServiceSpecificCredential",
@@ -411,7 +412,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Deletes the access key pair associated with the specified IAM user.</p> <p>If you do not specify a user name, IAM determines the user name implicitly based on the AWS access key ID signing the request. Because this action works for access keys under the AWS account, you can use this action to manage root credentials even if the AWS account has no associated users.</p>"
+      "documentation":"<p>Deletes the access key pair associated with the specified IAM user.</p> <p>If you do not specify a user name, IAM determines the user name implicitly based on the AWS access key ID signing the request. Because this operation works for access keys under the AWS account, you can use this operation to manage AWS account root user credentials even if the AWS account has no associated users.</p>"
     },
     "DeleteAccountAlias":{
       "name":"DeleteAccountAlias",
@@ -482,7 +483,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Deletes the specified instance profile. The instance profile must not have an associated role.</p> <important> <p>Make sure you do not have any Amazon EC2 instances running with the instance profile you are about to delete. Deleting a role or instance profile that is associated with a running instance will break any applications running on the instance.</p> </important> <p>For more information about instance profiles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html\">About Instance Profiles</a>.</p>"
+      "documentation":"<p>Deletes the specified instance profile. The instance profile must not have an associated role.</p> <important> <p>Make sure that you do not have any Amazon EC2 instances running with the instance profile you are about to delete. Deleting a role or instance profile that is associated with a running instance will break any applications running on the instance.</p> </important> <p>For more information about instance profiles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html\">About Instance Profiles</a>.</p>"
     },
     "DeleteLoginProfile":{
       "name":"DeleteLoginProfile",
@@ -511,7 +512,7 @@
         {"shape":"NoSuchEntityException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Deletes an OpenID Connect identity provider (IdP) resource object in IAM.</p> <p>Deleting an IAM OIDC provider resource does not update any roles that reference the provider as a principal in their trust policies. Any attempt to assume a role that references a deleted provider fails.</p> <p>This action is idempotent; it does not fail or return an error if you call the action for a provider that does not exist.</p>"
+      "documentation":"<p>Deletes an OpenID Connect identity provider (IdP) resource object in IAM.</p> <p>Deleting an IAM OIDC provider resource does not update any roles that reference the provider as a principal in their trust policies. Any attempt to assume a role that references a deleted provider fails.</p> <p>This operation is idempotent; it does not fail or return an error if you call the operation for a provider that does not exist.</p>"
     },
     "DeletePolicy":{
       "name":"DeletePolicy",
@@ -527,7 +528,7 @@
         {"shape":"DeleteConflictException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Deletes the specified managed policy.</p> <p>Before you can delete a managed policy, you must first detach the policy from all users, groups, and roles that it is attached to, and you must delete all of the policy's versions. The following steps describe the process for deleting a managed policy:</p> <ul> <li> <p>Detach the policy from all users, groups, and roles that the policy is attached to, using the <a>DetachUserPolicy</a>, <a>DetachGroupPolicy</a>, or <a>DetachRolePolicy</a> APIs. To list all the users, groups, and roles that a policy is attached to, use <a>ListEntitiesForPolicy</a>.</p> </li> <li> <p>Delete all versions of the policy using <a>DeletePolicyVersion</a>. To list the policy's versions, use <a>ListPolicyVersions</a>. You cannot use <a>DeletePolicyVersion</a> to delete the version that is marked as the default version. You delete the policy's default version in the next step of the process.</p> </li> <li> <p>Delete the policy (this automatically deletes the policy's default version) using this API.</p> </li> </ul> <p>For information about managed policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p>"
+      "documentation":"<p>Deletes the specified managed policy.</p> <p>Before you can delete a managed policy, you must first detach the policy from all users, groups, and roles that it is attached to. In addition you must delete all the policy's versions. The following steps describe the process for deleting a managed policy:</p> <ul> <li> <p>Detach the policy from all users, groups, and roles that the policy is attached to, using the <a>DetachUserPolicy</a>, <a>DetachGroupPolicy</a>, or <a>DetachRolePolicy</a> API operations. To list all the users, groups, and roles that a policy is attached to, use <a>ListEntitiesForPolicy</a>.</p> </li> <li> <p>Delete all versions of the policy using <a>DeletePolicyVersion</a>. To list the policy's versions, use <a>ListPolicyVersions</a>. You cannot use <a>DeletePolicyVersion</a> to delete the version that is marked as the default version. You delete the policy's default version in the next step of the process.</p> </li> <li> <p>Delete the policy (this automatically deletes the policy's default version) using this API.</p> </li> </ul> <p>For information about managed policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p>"
     },
     "DeletePolicyVersion":{
       "name":"DeletePolicyVersion",
@@ -559,7 +560,7 @@
         {"shape":"UnmodifiableEntityException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Deletes the specified role. The role must not have any policies attached. For more information about roles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html\">Working with Roles</a>.</p> <important> <p>Make sure you do not have any Amazon EC2 instances running with the role you are about to delete. Deleting a role or instance profile that is associated with a running instance will break any applications running on the instance.</p> </important>"
+      "documentation":"<p>Deletes the specified role. The role must not have any policies attached. For more information about roles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html\">Working with Roles</a>.</p> <important> <p>Make sure that you do not have any Amazon EC2 instances running with the role you are about to delete. Deleting a role or instance profile that is associated with a running instance will break any applications running on the instance.</p> </important>"
     },
     "DeleteRolePolicy":{
       "name":"DeleteRolePolicy",
@@ -601,7 +602,7 @@
       "errors":[
         {"shape":"NoSuchEntityException"}
       ],
-      "documentation":"<p>Deletes the specified SSH public key.</p> <p>The SSH public key deleted by this action is used only for authenticating the associated IAM user to an AWS CodeCommit repository. For more information about using SSH keys to authenticate to an AWS CodeCommit repository, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html\">Set up AWS CodeCommit for SSH Connections</a> in the <i>AWS CodeCommit User Guide</i>.</p>"
+      "documentation":"<p>Deletes the specified SSH public key.</p> <p>The SSH public key deleted by this operation is used only for authenticating the associated IAM user to an AWS CodeCommit repository. For more information about using SSH keys to authenticate to an AWS CodeCommit repository, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html\">Set up AWS CodeCommit for SSH Connections</a> in the <i>AWS CodeCommit User Guide</i>.</p>"
     },
     "DeleteServerCertificate":{
       "name":"DeleteServerCertificate",
@@ -616,7 +617,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Deletes the specified server certificate.</p> <p>For more information about working with server certificates, including a list of AWS services that can use the server certificates that you manage with IAM, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html\">Working with Server Certificates</a> in the <i>IAM User Guide</i>.</p> <important> <p> If you are using a server certificate with Elastic Load Balancing, deleting the certificate could have implications for your application. If Elastic Load Balancing doesn't detect the deletion of bound certificates, it may continue to use the certificates. This could cause Elastic Load Balancing to stop accepting traffic. We recommend that you remove the reference to the certificate from Elastic Load Balancing before using this command to delete the certificate. For more information, go to <a href=\"http://docs.aws.amazon.com/ElasticLoadBalancing/latest/APIReference/API_DeleteLoadBalancerListeners.html\">DeleteLoadBalancerListeners</a> in the <i>Elastic Load Balancing API Reference</i>.</p> </important>"
+      "documentation":"<p>Deletes the specified server certificate.</p> <p>For more information about working with server certificates, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html\">Working with Server Certificates</a> in the <i>IAM User Guide</i>. This topic also includes a list of AWS services that can use the server certificates that you manage with IAM.</p> <important> <p> If you are using a server certificate with Elastic Load Balancing, deleting the certificate could have implications for your application. If Elastic Load Balancing doesn't detect the deletion of bound certificates, it may continue to use the certificates. This could cause Elastic Load Balancing to stop accepting traffic. We recommend that you remove the reference to the certificate from Elastic Load Balancing before using this command to delete the certificate. For more information, go to <a href=\"http://docs.aws.amazon.com/ElasticLoadBalancing/latest/APIReference/API_DeleteLoadBalancerListeners.html\">DeleteLoadBalancerListeners</a> in the <i>Elastic Load Balancing API Reference</i>.</p> </important>"
     },
     "DeleteServiceLinkedRole":{
       "name":"DeleteServiceLinkedRole",
@@ -634,7 +635,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Submits a service-linked role deletion request and returns a <code>DeletionTaskId</code>, which you can use to check the status of the deletion. Before you call this operation, confirm that the role has no active sessions and that any resources used by the role in the linked service are deleted. If you call this operation more than once for the same service-linked role and an earlier deletion task is not complete, then the <code>DeletionTaskId</code> of the earlier request is returned.</p> <p>If you submit a deletion request for a service-linked role whose linked service is still accessing a resource, then the deletion task fails. If it fails, the <a>GetServiceLinkedRoleDeletionStatus</a> API operation returns the reason for the failure, including the resources that must be deleted. To delete the service-linked role, you must first remove those resources from the linked service and then submit the deletion request again. Resources are specific to the service that is linked to the role. For more information about removing resources from a service, see the <a href=\"http://docs.aws.amazon.com/\">AWS documentation</a> for your service.</p> <p>For more information about service-linked roles, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_terms-and-concepts.html#iam-term-service-linked-role\">Roles Terms and Concepts: AWS Service-Linked Role</a> in the <i>IAM User Guide</i>.</p>"
+      "documentation":"<p>Submits a service-linked role deletion request and returns a <code>DeletionTaskId</code>, which you can use to check the status of the deletion. Before you call this operation, confirm that the role has no active sessions and that any resources used by the role in the linked service are deleted. If you call this operation more than once for the same service-linked role and an earlier deletion task is not complete, then the <code>DeletionTaskId</code> of the earlier request is returned.</p> <p>If you submit a deletion request for a service-linked role whose linked service is still accessing a resource, then the deletion task fails. If it fails, the <a>GetServiceLinkedRoleDeletionStatus</a> API operation returns the reason for the failure, usually including the resources that must be deleted. To delete the service-linked role, you must first remove those resources from the linked service and then submit the deletion request again. Resources are specific to the service that is linked to the role. For more information about removing resources from a service, see the <a href=\"http://docs.aws.amazon.com/\">AWS documentation</a> for your service.</p> <p>For more information about service-linked roles, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_terms-and-concepts.html#iam-term-service-linked-role\">Roles Terms and Concepts: AWS Service-Linked Role</a> in the <i>IAM User Guide</i>.</p>"
     },
     "DeleteServiceSpecificCredential":{
       "name":"DeleteServiceSpecificCredential",
@@ -660,7 +661,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Deletes a signing certificate associated with the specified IAM user.</p> <p>If you do not specify a user name, IAM determines the user name implicitly based on the AWS access key ID signing the request. Because this action works for access keys under the AWS account, you can use this action to manage root credentials even if the AWS account has no associated IAM users.</p>"
+      "documentation":"<p>Deletes a signing certificate associated with the specified IAM user.</p> <p>If you do not specify a user name, IAM determines the user name implicitly based on the AWS access key ID signing the request. Because this operation works for access keys under the AWS account, you can use this operation to manage AWS account root user credentials even if the AWS account has no associated IAM users.</p>"
     },
     "DeleteUser":{
       "name":"DeleteUser",
@@ -815,7 +816,7 @@
       "errors":[
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Retrieves information about all IAM users, groups, roles, and policies in your AWS account, including their relationships to one another. Use this API to obtain a snapshot of the configuration of IAM permissions (users, groups, roles, and policies) in your account.</p> <p>You can optionally filter the results using the <code>Filter</code> parameter. You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>"
+      "documentation":"<p>Retrieves information about all IAM users, groups, roles, and policies in your AWS account, including their relationships to one another. Use this API to obtain a snapshot of the configuration of IAM permissions (users, groups, roles, and policies) in your account.</p> <note> <p>Policies returned by this API are URL-encoded compliant with <a href=\"https://tools.ietf.org/html/rfc3986\">RFC 3986</a>. You can use a URL decoding method to convert the policy back to plain JSON text. For example, if you use Java, you can use the <code>decode</code> method of the <code>java.net.URLDecoder</code> utility class in the Java SDK. Other languages and SDKs provide similar functionality.</p> </note> <p>You can optionally filter the results using the <code>Filter</code> parameter. You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>"
     },
     "GetAccountPasswordPolicy":{
       "name":"GetAccountPasswordPolicy",
@@ -862,7 +863,7 @@
       "errors":[
         {"shape":"InvalidInputException"}
       ],
-      "documentation":"<p>Gets a list of all of the context keys referenced in the input policies. The policies are supplied as a list of one or more strings. To get the context keys from policies associated with an IAM user, group, or role, use <a>GetContextKeysForPrincipalPolicy</a>.</p> <p>Context keys are variables maintained by AWS and its services that provide details about the context of an API query request, and can be evaluated by testing against a value specified in an IAM policy. Use GetContextKeysForCustomPolicy to understand what key names and values you must supply when you call <a>SimulateCustomPolicy</a>. Note that all parameters are shown in unencoded form here for clarity, but must be URL encoded to be included as a part of a real HTML request.</p>"
+      "documentation":"<p>Gets a list of all of the context keys referenced in the input policies. The policies are supplied as a list of one or more strings. To get the context keys from policies associated with an IAM user, group, or role, use <a>GetContextKeysForPrincipalPolicy</a>.</p> <p>Context keys are variables maintained by AWS and its services that provide details about the context of an API query request. Context keys can be evaluated by testing against a value specified in an IAM policy. Use <code>GetContextKeysForCustomPolicy</code> to understand what key names and values you must supply when you call <a>SimulateCustomPolicy</a>. Note that all parameters are shown in unencoded form here for clarity but must be URL encoded to be included as a part of a real HTML request.</p>"
     },
     "GetContextKeysForPrincipalPolicy":{
       "name":"GetContextKeysForPrincipalPolicy",
@@ -879,7 +880,7 @@
         {"shape":"NoSuchEntityException"},
         {"shape":"InvalidInputException"}
       ],
-      "documentation":"<p>Gets a list of all of the context keys referenced in all of the IAM policies attached to the specified IAM entity. The entity can be an IAM user, group, or role. If you specify a user, then the request also includes all of the policies attached to groups that the user is a member of.</p> <p>You can optionally include a list of one or more additional policies, specified as strings. If you want to include <i>only</i> a list of policies by string, use <a>GetContextKeysForCustomPolicy</a> instead.</p> <p> <b>Note:</b> This API discloses information about the permissions granted to other users. If you do not want users to see other user's permissions, then consider allowing them to use <a>GetContextKeysForCustomPolicy</a> instead.</p> <p>Context keys are variables maintained by AWS and its services that provide details about the context of an API query request, and can be evaluated by testing against a value in an IAM policy. Use <a>GetContextKeysForPrincipalPolicy</a> to understand what key names and values you must supply when you call <a>SimulatePrincipalPolicy</a>.</p>"
+      "documentation":"<p>Gets a list of all of the context keys referenced in all the IAM policies that are attached to the specified IAM entity. The entity can be an IAM user, group, or role. If you specify a user, then the request also includes all of the policies attached to groups that the user is a member of.</p> <p>You can optionally include a list of one or more additional policies, specified as strings. If you want to include <i>only</i> a list of policies by string, use <a>GetContextKeysForCustomPolicy</a> instead.</p> <p> <b>Note:</b> This API discloses information about the permissions granted to other users. If you do not want users to see other user's permissions, then consider allowing them to use <a>GetContextKeysForCustomPolicy</a> instead.</p> <p>Context keys are variables maintained by AWS and its services that provide details about the context of an API query request. Context keys can be evaluated by testing against a value in an IAM policy. Use <a>GetContextKeysForPrincipalPolicy</a> to understand what key names and values you must supply when you call <a>SimulatePrincipalPolicy</a>.</p>"
     },
     "GetCredentialReport":{
       "name":"GetCredentialReport",
@@ -965,7 +966,7 @@
         {"shape":"NoSuchEntityException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Retrieves the user name and password-creation date for the specified IAM user. If the user has not been assigned a password, the action returns a 404 (<code>NoSuchEntity</code>) error.</p>"
+      "documentation":"<p>Retrieves the user name and password-creation date for the specified IAM user. If the user has not been assigned a password, the operation returns a 404 (<code>NoSuchEntity</code>) error.</p>"
     },
     "GetOpenIDConnectProvider":{
       "name":"GetOpenIDConnectProvider",
@@ -1088,7 +1089,7 @@
         {"shape":"NoSuchEntityException"},
         {"shape":"UnrecognizedPublicKeyEncodingException"}
       ],
-      "documentation":"<p>Retrieves the specified SSH public key, including metadata about the key.</p> <p>The SSH public key retrieved by this action is used only for authenticating the associated IAM user to an AWS CodeCommit repository. For more information about using SSH keys to authenticate to an AWS CodeCommit repository, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html\">Set up AWS CodeCommit for SSH Connections</a> in the <i>AWS CodeCommit User Guide</i>.</p>"
+      "documentation":"<p>Retrieves the specified SSH public key, including metadata about the key.</p> <p>The SSH public key retrieved by this operation is used only for authenticating the associated IAM user to an AWS CodeCommit repository. For more information about using SSH keys to authenticate to an AWS CodeCommit repository, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html\">Set up AWS CodeCommit for SSH Connections</a> in the <i>AWS CodeCommit User Guide</i>.</p>"
     },
     "GetServerCertificate":{
       "name":"GetServerCertificate",
@@ -1105,7 +1106,7 @@
         {"shape":"NoSuchEntityException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Retrieves information about the specified server certificate stored in IAM.</p> <p>For more information about working with server certificates, including a list of AWS services that can use the server certificates that you manage with IAM, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html\">Working with Server Certificates</a> in the <i>IAM User Guide</i>.</p>"
+      "documentation":"<p>Retrieves information about the specified server certificate stored in IAM.</p> <p>For more information about working with server certificates, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html\">Working with Server Certificates</a> in the <i>IAM User Guide</i>. This topic includes a list of AWS services that can use the server certificates that you manage with IAM.</p>"
     },
     "GetServiceLinkedRoleDeletionStatus":{
       "name":"GetServiceLinkedRoleDeletionStatus",
@@ -1123,7 +1124,7 @@
         {"shape":"InvalidInputException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Retrieves the status of your service-linked role deletion. After you use the <a>DeleteServiceLinkedRole</a> API operation to submit a service-linked role for deletion, you can use the <code>DeletionTaskId</code> parameter in <code>GetServiceLinkedRoleDeletionStatus</code> to check the status of the deletion. If the deletion fails, this operation returns the reason that it failed.</p>"
+      "documentation":"<p>Retrieves the status of your service-linked role deletion. After you use the <a>DeleteServiceLinkedRole</a> API operation to submit a service-linked role for deletion, you can use the <code>DeletionTaskId</code> parameter in <code>GetServiceLinkedRoleDeletionStatus</code> to check the status of the deletion. If the deletion fails, this operation returns the reason that it failed, if that information is returned by the service.</p>"
     },
     "GetUser":{
       "name":"GetUser",
@@ -1174,7 +1175,7 @@
         {"shape":"NoSuchEntityException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Returns information about the access key IDs associated with the specified IAM user. If there are none, the action returns an empty list.</p> <p>Although each user is limited to a small number of keys, you can still paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p> <p>If the <code>UserName</code> field is not specified, the UserName is determined implicitly based on the AWS access key ID used to sign the request. Because this action works for access keys under the AWS account, you can use this action to manage root credentials even if the AWS account has no associated users.</p> <note> <p>To ensure the security of your AWS account, the secret access key is accessible only during key and user creation.</p> </note>"
+      "documentation":"<p>Returns information about the access key IDs associated with the specified IAM user. If there are none, the operation returns an empty list.</p> <p>Although each user is limited to a small number of keys, you can still paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p> <p>If the <code>UserName</code> field is not specified, the user name is determined implicitly based on the AWS access key ID used to sign the request. Because this operation works for access keys under the AWS account, you can use this operation to manage AWS account root user credentials even if the AWS account has no associated users.</p> <note> <p>To ensure the security of your AWS account, the secret access key is accessible only during key and user creation.</p> </note>"
     },
     "ListAccountAliases":{
       "name":"ListAccountAliases",
@@ -1208,7 +1209,7 @@
         {"shape":"InvalidInputException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Lists all managed policies that are attached to the specified IAM group.</p> <p>An IAM group can also have inline policies embedded with it. To list the inline policies for a group, use the <a>ListGroupPolicies</a> API. For information about policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters. You can use the <code>PathPrefix</code> parameter to limit the list of policies to only those matching the specified path prefix. If there are no policies attached to the specified group (or none that match the specified path prefix), the action returns an empty list.</p>"
+      "documentation":"<p>Lists all managed policies that are attached to the specified IAM group.</p> <p>An IAM group can also have inline policies embedded with it. To list the inline policies for a group, use the <a>ListGroupPolicies</a> API. For information about policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters. You can use the <code>PathPrefix</code> parameter to limit the list of policies to only those matching the specified path prefix. If there are no policies attached to the specified group (or none that match the specified path prefix), the operation returns an empty list.</p>"
     },
     "ListAttachedRolePolicies":{
       "name":"ListAttachedRolePolicies",
@@ -1226,7 +1227,7 @@
         {"shape":"InvalidInputException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Lists all managed policies that are attached to the specified IAM role.</p> <p>An IAM role can also have inline policies embedded with it. To list the inline policies for a role, use the <a>ListRolePolicies</a> API. For information about policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters. You can use the <code>PathPrefix</code> parameter to limit the list of policies to only those matching the specified path prefix. If there are no policies attached to the specified role (or none that match the specified path prefix), the action returns an empty list.</p>"
+      "documentation":"<p>Lists all managed policies that are attached to the specified IAM role.</p> <p>An IAM role can also have inline policies embedded with it. To list the inline policies for a role, use the <a>ListRolePolicies</a> API. For information about policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters. You can use the <code>PathPrefix</code> parameter to limit the list of policies to only those matching the specified path prefix. If there are no policies attached to the specified role (or none that match the specified path prefix), the operation returns an empty list.</p>"
     },
     "ListAttachedUserPolicies":{
       "name":"ListAttachedUserPolicies",
@@ -1244,7 +1245,7 @@
         {"shape":"InvalidInputException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Lists all managed policies that are attached to the specified IAM user.</p> <p>An IAM user can also have inline policies embedded with it. To list the inline policies for a user, use the <a>ListUserPolicies</a> API. For information about policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters. You can use the <code>PathPrefix</code> parameter to limit the list of policies to only those matching the specified path prefix. If there are no policies attached to the specified group (or none that match the specified path prefix), the action returns an empty list.</p>"
+      "documentation":"<p>Lists all managed policies that are attached to the specified IAM user.</p> <p>An IAM user can also have inline policies embedded with it. To list the inline policies for a user, use the <a>ListUserPolicies</a> API. For information about policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters. You can use the <code>PathPrefix</code> parameter to limit the list of policies to only those matching the specified path prefix. If there are no policies attached to the specified group (or none that match the specified path prefix), the operation returns an empty list.</p>"
     },
     "ListEntitiesForPolicy":{
       "name":"ListEntitiesForPolicy",
@@ -1279,7 +1280,7 @@
         {"shape":"NoSuchEntityException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Lists the names of the inline policies that are embedded in the specified IAM group.</p> <p>An IAM group can also have managed policies attached to it. To list the managed policies that are attached to a group, use <a>ListAttachedGroupPolicies</a>. For more information about policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters. If there are no inline policies embedded with the specified group, the action returns an empty list.</p>"
+      "documentation":"<p>Lists the names of the inline policies that are embedded in the specified IAM group.</p> <p>An IAM group can also have managed policies attached to it. To list the managed policies that are attached to a group, use <a>ListAttachedGroupPolicies</a>. For more information about policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters. If there are no inline policies embedded with the specified group, the operation returns an empty list.</p>"
     },
     "ListGroups":{
       "name":"ListGroups",
@@ -1328,7 +1329,7 @@
       "errors":[
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Lists the instance profiles that have the specified path prefix. If there are none, the action returns an empty list. For more information about instance profiles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html\">About Instance Profiles</a>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>"
+      "documentation":"<p>Lists the instance profiles that have the specified path prefix. If there are none, the operation returns an empty list. For more information about instance profiles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html\">About Instance Profiles</a>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>"
     },
     "ListInstanceProfilesForRole":{
       "name":"ListInstanceProfilesForRole",
@@ -1345,7 +1346,7 @@
         {"shape":"NoSuchEntityException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Lists the instance profiles that have the specified associated IAM role. If there are none, the action returns an empty list. For more information about instance profiles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html\">About Instance Profiles</a>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>"
+      "documentation":"<p>Lists the instance profiles that have the specified associated IAM role. If there are none, the operation returns an empty list. For more information about instance profiles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html\">About Instance Profiles</a>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>"
     },
     "ListMFADevices":{
       "name":"ListMFADevices",
@@ -1362,7 +1363,7 @@
         {"shape":"NoSuchEntityException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Lists the MFA devices for an IAM user. If the request includes a IAM user name, then this action lists all the MFA devices associated with the specified user. If you do not specify a user name, IAM determines the user name implicitly based on the AWS access key ID signing the request for this API.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>"
+      "documentation":"<p>Lists the MFA devices for an IAM user. If the request includes a IAM user name, then this operation lists all the MFA devices associated with the specified user. If you do not specify a user name, IAM determines the user name implicitly based on the AWS access key ID signing the request for this API.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>"
     },
     "ListOpenIDConnectProviders":{
       "name":"ListOpenIDConnectProviders",
@@ -1429,7 +1430,7 @@
         {"shape":"NoSuchEntityException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Lists the names of the inline policies that are embedded in the specified IAM role.</p> <p>An IAM role can also have managed policies attached to it. To list the managed policies that are attached to a role, use <a>ListAttachedRolePolicies</a>. For more information about policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters. If there are no inline policies embedded with the specified role, the action returns an empty list.</p>"
+      "documentation":"<p>Lists the names of the inline policies that are embedded in the specified IAM role.</p> <p>An IAM role can also have managed policies attached to it. To list the managed policies that are attached to a role, use <a>ListAttachedRolePolicies</a>. For more information about policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters. If there are no inline policies embedded with the specified role, the operation returns an empty list.</p>"
     },
     "ListRoles":{
       "name":"ListRoles",
@@ -1445,7 +1446,7 @@
       "errors":[
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Lists the IAM roles that have the specified path prefix. If there are none, the action returns an empty list. For more information about roles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html\">Working with Roles</a>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>"
+      "documentation":"<p>Lists the IAM roles that have the specified path prefix. If there are none, the operation returns an empty list. For more information about roles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html\">Working with Roles</a>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>"
     },
     "ListSAMLProviders":{
       "name":"ListSAMLProviders",
@@ -1477,7 +1478,7 @@
       "errors":[
         {"shape":"NoSuchEntityException"}
       ],
-      "documentation":"<p>Returns information about the SSH public keys associated with the specified IAM user. If there are none, the action returns an empty list.</p> <p>The SSH public keys returned by this action are used only for authenticating the IAM user to an AWS CodeCommit repository. For more information about using SSH keys to authenticate to an AWS CodeCommit repository, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html\">Set up AWS CodeCommit for SSH Connections</a> in the <i>AWS CodeCommit User Guide</i>.</p> <p>Although each user is limited to a small number of keys, you can still paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>"
+      "documentation":"<p>Returns information about the SSH public keys associated with the specified IAM user. If there are none, the operation returns an empty list.</p> <p>The SSH public keys returned by this operation are used only for authenticating the IAM user to an AWS CodeCommit repository. For more information about using SSH keys to authenticate to an AWS CodeCommit repository, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html\">Set up AWS CodeCommit for SSH Connections</a> in the <i>AWS CodeCommit User Guide</i>.</p> <p>Although each user is limited to a small number of keys, you can still paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>"
     },
     "ListServerCertificates":{
       "name":"ListServerCertificates",
@@ -1493,7 +1494,7 @@
       "errors":[
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Lists the server certificates stored in IAM that have the specified path prefix. If none exist, the action returns an empty list.</p> <p> You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p> <p>For more information about working with server certificates, including a list of AWS services that can use the server certificates that you manage with IAM, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html\">Working with Server Certificates</a> in the <i>IAM User Guide</i>.</p>"
+      "documentation":"<p>Lists the server certificates stored in IAM that have the specified path prefix. If none exist, the operation returns an empty list.</p> <p> You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p> <p>For more information about working with server certificates, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html\">Working with Server Certificates</a> in the <i>IAM User Guide</i>. This topic also includes a list of AWS services that can use the server certificates that you manage with IAM.</p>"
     },
     "ListServiceSpecificCredentials":{
       "name":"ListServiceSpecificCredentials",
@@ -1510,7 +1511,7 @@
         {"shape":"NoSuchEntityException"},
         {"shape":"ServiceNotSupportedException"}
       ],
-      "documentation":"<p>Returns information about the service-specific credentials associated with the specified IAM user. If there are none, the action returns an empty list. The service-specific credentials returned by this action are used only for authenticating the IAM user to a specific service. For more information about using service-specific credentials to authenticate to an AWS service, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-gc.html\">Set Up service-specific credentials</a> in the AWS CodeCommit User Guide.</p>"
+      "documentation":"<p>Returns information about the service-specific credentials associated with the specified IAM user. If there are none, the operation returns an empty list. The service-specific credentials returned by this operation are used only for authenticating the IAM user to a specific service. For more information about using service-specific credentials to authenticate to an AWS service, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-gc.html\">Set Up service-specific credentials</a> in the AWS CodeCommit User Guide.</p>"
     },
     "ListSigningCertificates":{
       "name":"ListSigningCertificates",
@@ -1527,7 +1528,7 @@
         {"shape":"NoSuchEntityException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Returns information about the signing certificates associated with the specified IAM user. If there are none, the action returns an empty list.</p> <p>Although each user is limited to a small number of signing certificates, you can still paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p> <p>If the <code>UserName</code> field is not specified, the user name is determined implicitly based on the AWS access key ID used to sign the request for this API. Because this action works for access keys under the AWS account, you can use this action to manage root credentials even if the AWS account has no associated users.</p>"
+      "documentation":"<p>Returns information about the signing certificates associated with the specified IAM user. If there are none, the operation returns an empty list.</p> <p>Although each user is limited to a small number of signing certificates, you can still paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p> <p>If the <code>UserName</code> field is not specified, the user name is determined implicitly based on the AWS access key ID used to sign the request for this API. Because this operation works for access keys under the AWS account, you can use this operation to manage AWS account root user credentials even if the AWS account has no associated users.</p>"
     },
     "ListUserPolicies":{
       "name":"ListUserPolicies",
@@ -1544,7 +1545,7 @@
         {"shape":"NoSuchEntityException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Lists the names of the inline policies embedded in the specified IAM user.</p> <p>An IAM user can also have managed policies attached to it. To list the managed policies that are attached to a user, use <a>ListAttachedUserPolicies</a>. For more information about policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters. If there are no inline policies embedded with the specified user, the action returns an empty list.</p>"
+      "documentation":"<p>Lists the names of the inline policies embedded in the specified IAM user.</p> <p>An IAM user can also have managed policies attached to it. To list the managed policies that are attached to a user, use <a>ListAttachedUserPolicies</a>. For more information about policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters. If there are no inline policies embedded with the specified user, the operation returns an empty list.</p>"
     },
     "ListUsers":{
       "name":"ListUsers",
@@ -1560,7 +1561,7 @@
       "errors":[
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Lists the IAM users that have the specified path prefix. If no path prefix is specified, the action returns all users in the AWS account. If there are none, the action returns an empty list.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>"
+      "documentation":"<p>Lists the IAM users that have the specified path prefix. If no path prefix is specified, the operation returns all users in the AWS account. If there are none, the operation returns an empty list.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>"
     },
     "ListVirtualMFADevices":{
       "name":"ListVirtualMFADevices",
@@ -1573,7 +1574,7 @@
         "shape":"ListVirtualMFADevicesResponse",
         "resultWrapper":"ListVirtualMFADevicesResult"
       },
-      "documentation":"<p>Lists the virtual MFA devices defined in the AWS account by assignment status. If you do not specify an assignment status, the action returns a list of all virtual MFA devices. Assignment status can be <code>Assigned</code>, <code>Unassigned</code>, or <code>Any</code>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>"
+      "documentation":"<p>Lists the virtual MFA devices defined in the AWS account by assignment status. If you do not specify an assignment status, the operation returns a list of all virtual MFA devices. Assignment status can be <code>Assigned</code>, <code>Unassigned</code>, or <code>Any</code>.</p> <p>You can paginate the results using the <code>MaxItems</code> and <code>Marker</code> parameters.</p>"
     },
     "PutGroupPolicy":{
       "name":"PutGroupPolicy",
@@ -1633,7 +1634,7 @@
         {"shape":"NoSuchEntityException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Removes the specified client ID (also known as audience) from the list of client IDs registered for the specified IAM OpenID Connect (OIDC) provider resource object.</p> <p>This action is idempotent; it does not fail or return an error if you try to remove a client ID that does not exist.</p>"
+      "documentation":"<p>Removes the specified client ID (also known as audience) from the list of client IDs registered for the specified IAM OpenID Connect (OIDC) provider resource object.</p> <p>This operation is idempotent; it does not fail or return an error if you try to remove a client ID that does not exist.</p>"
     },
     "RemoveRoleFromInstanceProfile":{
       "name":"RemoveRoleFromInstanceProfile",
@@ -1648,7 +1649,7 @@
         {"shape":"UnmodifiableEntityException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Removes the specified IAM role from the specified EC2 instance profile.</p> <important> <p>Make sure you do not have any Amazon EC2 instances running with the role you are about to remove from the instance profile. Removing a role from an instance profile that is associated with a running instance might break any applications running on the instance.</p> </important> <p> For more information about IAM roles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html\">Working with Roles</a>. For more information about instance profiles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html\">About Instance Profiles</a>.</p>"
+      "documentation":"<p>Removes the specified IAM role from the specified EC2 instance profile.</p> <important> <p>Make sure that you do not have any Amazon EC2 instances running with the role you are about to remove from the instance profile. Removing a role from an instance profile that is associated with a running instance might break any applications running on the instance.</p> </important> <p> For more information about IAM roles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html\">Working with Roles</a>. For more information about instance profiles, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/AboutInstanceProfiles.html\">About Instance Profiles</a>.</p>"
     },
     "RemoveUserFromGroup":{
       "name":"RemoveUserFromGroup",
@@ -1708,7 +1709,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Sets the specified version of the specified policy as the policy's default (operative) version.</p> <p>This action affects all users, groups, and roles that the policy is attached to. To list the users, groups, and roles that the policy is attached to, use the <a>ListEntitiesForPolicy</a> API.</p> <p>For information about managed policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p>"
+      "documentation":"<p>Sets the specified version of the specified policy as the policy's default (operative) version.</p> <p>This operation affects all users, groups, and roles that the policy is attached to. To list the users, groups, and roles that the policy is attached to, use the <a>ListEntitiesForPolicy</a> API.</p> <p>For information about managed policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>.</p>"
     },
     "SimulateCustomPolicy":{
       "name":"SimulateCustomPolicy",
@@ -1725,7 +1726,7 @@
         {"shape":"InvalidInputException"},
         {"shape":"PolicyEvaluationException"}
       ],
-      "documentation":"<p>Simulate how a set of IAM policies and optionally a resource-based policy works with a list of API actions and AWS resources to determine the policies' effective permissions. The policies are provided as strings.</p> <p>The simulation does not perform the API actions; it only checks the authorization to determine if the simulated policies allow or deny the actions.</p> <p>If you want to simulate existing policies attached to an IAM user, group, or role, use <a>SimulatePrincipalPolicy</a> instead.</p> <p>Context keys are variables maintained by AWS and its services that provide details about the context of an API query request. You can use the <code>Condition</code> element of an IAM policy to evaluate context keys. To get the list of context keys that the policies require for correct simulation, use <a>GetContextKeysForCustomPolicy</a>.</p> <p>If the output is long, you can use <code>MaxItems</code> and <code>Marker</code> parameters to paginate the results.</p>"
+      "documentation":"<p>Simulate how a set of IAM policies and optionally a resource-based policy works with a list of API operations and AWS resources to determine the policies' effective permissions. The policies are provided as strings.</p> <p>The simulation does not perform the API operations; it only checks the authorization to determine if the simulated policies allow or deny the operations.</p> <p>If you want to simulate existing policies attached to an IAM user, group, or role, use <a>SimulatePrincipalPolicy</a> instead.</p> <p>Context keys are variables maintained by AWS and its services that provide details about the context of an API query request. You can use the <code>Condition</code> element of an IAM policy to evaluate context keys. To get the list of context keys that the policies require for correct simulation, use <a>GetContextKeysForCustomPolicy</a>.</p> <p>If the output is long, you can use <code>MaxItems</code> and <code>Marker</code> parameters to paginate the results.</p>"
     },
     "SimulatePrincipalPolicy":{
       "name":"SimulatePrincipalPolicy",
@@ -1743,7 +1744,7 @@
         {"shape":"InvalidInputException"},
         {"shape":"PolicyEvaluationException"}
       ],
-      "documentation":"<p>Simulate how a set of IAM policies attached to an IAM entity works with a list of API actions and AWS resources to determine the policies' effective permissions. The entity can be an IAM user, group, or role. If you specify a user, then the simulation also includes all of the policies that are attached to groups that the user belongs to .</p> <p>You can optionally include a list of one or more additional policies specified as strings to include in the simulation. If you want to simulate only policies specified as strings, use <a>SimulateCustomPolicy</a> instead.</p> <p>You can also optionally include one resource-based policy to be evaluated with each of the resources included in the simulation.</p> <p>The simulation does not perform the API actions, it only checks the authorization to determine if the simulated policies allow or deny the actions.</p> <p> <b>Note:</b> This API discloses information about the permissions granted to other users. If you do not want users to see other user's permissions, then consider allowing them to use <a>SimulateCustomPolicy</a> instead.</p> <p>Context keys are variables maintained by AWS and its services that provide details about the context of an API query request. You can use the <code>Condition</code> element of an IAM policy to evaluate context keys. To get the list of context keys that the policies require for correct simulation, use <a>GetContextKeysForPrincipalPolicy</a>.</p> <p>If the output is long, you can use the <code>MaxItems</code> and <code>Marker</code> parameters to paginate the results.</p>"
+      "documentation":"<p>Simulate how a set of IAM policies attached to an IAM entity works with a list of API operations and AWS resources to determine the policies' effective permissions. The entity can be an IAM user, group, or role. If you specify a user, then the simulation also includes all of the policies that are attached to groups that the user belongs to.</p> <p>You can optionally include a list of one or more additional policies specified as strings to include in the simulation. If you want to simulate only policies specified as strings, use <a>SimulateCustomPolicy</a> instead.</p> <p>You can also optionally include one resource-based policy to be evaluated with each of the resources included in the simulation.</p> <p>The simulation does not perform the API operations, it only checks the authorization to determine if the simulated policies allow or deny the operations.</p> <p> <b>Note:</b> This API discloses information about the permissions granted to other users. If you do not want users to see other user's permissions, then consider allowing them to use <a>SimulateCustomPolicy</a> instead.</p> <p>Context keys are variables maintained by AWS and its services that provide details about the context of an API query request. You can use the <code>Condition</code> element of an IAM policy to evaluate context keys. To get the list of context keys that the policies require for correct simulation, use <a>GetContextKeysForPrincipalPolicy</a>.</p> <p>If the output is long, you can use the <code>MaxItems</code> and <code>Marker</code> parameters to paginate the results.</p>"
     },
     "UpdateAccessKey":{
       "name":"UpdateAccessKey",
@@ -1757,7 +1758,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Changes the status of the specified access key from Active to Inactive, or vice versa. This action can be used to disable a user's key as part of a key rotation work flow.</p> <p>If the <code>UserName</code> field is not specified, the UserName is determined implicitly based on the AWS access key ID used to sign the request. Because this action works for access keys under the AWS account, you can use this action to manage root credentials even if the AWS account has no associated users.</p> <p>For information about rotating keys, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/ManagingCredentials.html\">Managing Keys and Certificates</a> in the <i>IAM User Guide</i>.</p>"
+      "documentation":"<p>Changes the status of the specified access key from Active to Inactive, or vice versa. This operation can be used to disable a user's key as part of a key rotation workflow.</p> <p>If the <code>UserName</code> field is not specified, the user name is determined implicitly based on the AWS access key ID used to sign the request. Because this operation works for access keys under the AWS account, you can use this operation to manage AWS account root user credentials even if the AWS account has no associated users.</p> <p>For information about rotating keys, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/ManagingCredentials.html\">Managing Keys and Certificates</a> in the <i>IAM User Guide</i>.</p>"
     },
     "UpdateAccountPasswordPolicy":{
       "name":"UpdateAccountPasswordPolicy",
@@ -1772,7 +1773,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Updates the password policy settings for the AWS account.</p> <note> <p>This action does not support partial updates. No parameters are required, but if you do not specify a parameter, that parameter's value reverts to its default value. See the <b>Request Parameters</b> section for each parameter's default value.</p> </note> <p> For more information about using a password policy, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_ManagingPasswordPolicies.html\">Managing an IAM Password Policy</a> in the <i>IAM User Guide</i>.</p>"
+      "documentation":"<p>Updates the password policy settings for the AWS account.</p> <note> <ul> <li> <p>This operation does not support partial updates. No parameters are required, but if you do not specify a parameter, that parameter's value reverts to its default value. See the <b>Request Parameters</b> section for each parameter's default value. Also note that some parameters do not allow the default parameter to be explicitly set. Instead, to invoke the default value, do not include that parameter when you invoke the operation.</p> </li> </ul> </note> <p> For more information about using a password policy, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_ManagingPasswordPolicies.html\">Managing an IAM Password Policy</a> in the <i>IAM User Guide</i>.</p>"
     },
     "UpdateAssumeRolePolicy":{
       "name":"UpdateAssumeRolePolicy",
@@ -1803,7 +1804,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Updates the name and/or the path of the specified IAM group.</p> <important> <p> You should understand the implications of changing a group's path or name. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_WorkingWithGroupsAndUsers.html\">Renaming Users and Groups</a> in the <i>IAM User Guide</i>.</p> </important> <note> <p>To change an IAM group name the requester must have appropriate permissions on both the source object and the target object. For example, to change \"Managers\" to \"MGRs\", the entity making the request must have permission on both \"Managers\" and \"MGRs\", or must have permission on all (*). For more information about permissions, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/PermissionsAndPolicies.html\">Permissions and Policies</a>. </p> </note>"
+      "documentation":"<p>Updates the name and/or the path of the specified IAM group.</p> <important> <p> You should understand the implications of changing a group's path or name. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_WorkingWithGroupsAndUsers.html\">Renaming Users and Groups</a> in the <i>IAM User Guide</i>.</p> </important> <note> <p>The person making the request (the principal), must have permission to change the role group with the old name and the new name. For example, to change the group named <code>Managers</code> to <code>MGRs</code>, the principal must have a policy that allows them to update both groups. If the principal has permission to update the <code>Managers</code> group, but not the <code>MGRs</code> group, then the update fails. For more information about permissions, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/access.html\">Access Management</a>. </p> </note>"
     },
     "UpdateLoginProfile":{
       "name":"UpdateLoginProfile",
@@ -1833,7 +1834,25 @@
         {"shape":"NoSuchEntityException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Replaces the existing list of server certificate thumbprints associated with an OpenID Connect (OIDC) provider resource object with a new list of thumbprints.</p> <p>The list that you pass with this action completely replaces the existing list of thumbprints. (The lists are not merged.)</p> <p>Typically, you need to update a thumbprint only when the identity provider's certificate changes, which occurs rarely. However, if the provider's certificate <i>does</i> change, any attempt to assume an IAM role that specifies the OIDC provider as a principal fails until the certificate thumbprint is updated.</p> <note> <p>Because trust for the OIDC provider is ultimately derived from the provider's certificate and is validated by the thumbprint, it is a best practice to limit access to the <code>UpdateOpenIDConnectProviderThumbprint</code> action to highly-privileged users.</p> </note>"
+      "documentation":"<p>Replaces the existing list of server certificate thumbprints associated with an OpenID Connect (OIDC) provider resource object with a new list of thumbprints.</p> <p>The list that you pass with this operation completely replaces the existing list of thumbprints. (The lists are not merged.)</p> <p>Typically, you need to update a thumbprint only when the identity provider's certificate changes, which occurs rarely. However, if the provider's certificate <i>does</i> change, any attempt to assume an IAM role that specifies the OIDC provider as a principal fails until the certificate thumbprint is updated.</p> <note> <p>Because trust for the OIDC provider is derived from the provider's certificate and is validated by the thumbprint, it is best to limit access to the <code>UpdateOpenIDConnectProviderThumbprint</code> operation to highly privileged users.</p> </note>"
+    },
+    "UpdateRole":{
+      "name":"UpdateRole",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateRoleRequest"},
+      "output":{
+        "shape":"UpdateRoleResponse",
+        "resultWrapper":"UpdateRoleResult"
+      },
+      "errors":[
+        {"shape":"UnmodifiableEntityException"},
+        {"shape":"NoSuchEntityException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Updates the description or maximum session duration setting of a role.</p>"
     },
     "UpdateRoleDescription":{
       "name":"UpdateRoleDescription",
@@ -1851,7 +1870,7 @@
         {"shape":"UnmodifiableEntityException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Modifies the description of a role.</p>"
+      "documentation":"<p>Use instead.</p> <p>Modifies only the description of a role. This operation performs the same function as the <code>Description</code> parameter in the <code>UpdateRole</code> operation.</p>"
     },
     "UpdateSAMLProvider":{
       "name":"UpdateSAMLProvider",
@@ -1882,7 +1901,7 @@
       "errors":[
         {"shape":"NoSuchEntityException"}
       ],
-      "documentation":"<p>Sets the status of an IAM user's SSH public key to active or inactive. SSH public keys that are inactive cannot be used for authentication. This action can be used to disable a user's SSH public key as part of a key rotation work flow.</p> <p>The SSH public key affected by this action is used only for authenticating the associated IAM user to an AWS CodeCommit repository. For more information about using SSH keys to authenticate to an AWS CodeCommit repository, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html\">Set up AWS CodeCommit for SSH Connections</a> in the <i>AWS CodeCommit User Guide</i>.</p>"
+      "documentation":"<p>Sets the status of an IAM user's SSH public key to active or inactive. SSH public keys that are inactive cannot be used for authentication. This operation can be used to disable a user's SSH public key as part of a key rotation work flow.</p> <p>The SSH public key affected by this operation is used only for authenticating the associated IAM user to an AWS CodeCommit repository. For more information about using SSH keys to authenticate to an AWS CodeCommit repository, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html\">Set up AWS CodeCommit for SSH Connections</a> in the <i>AWS CodeCommit User Guide</i>.</p>"
     },
     "UpdateServerCertificate":{
       "name":"UpdateServerCertificate",
@@ -1897,7 +1916,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Updates the name and/or the path of the specified server certificate stored in IAM.</p> <p>For more information about working with server certificates, including a list of AWS services that can use the server certificates that you manage with IAM, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html\">Working with Server Certificates</a> in the <i>IAM User Guide</i>.</p> <important> <p>You should understand the implications of changing a server certificate's path or name. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs_manage.html#RenamingServerCerts\">Renaming a Server Certificate</a> in the <i>IAM User Guide</i>.</p> </important> <note> <p>To change a server certificate name the requester must have appropriate permissions on both the source object and the target object. For example, to change the name from \"ProductionCert\" to \"ProdCert\", the entity making the request must have permission on \"ProductionCert\" and \"ProdCert\", or must have permission on all (*). For more information about permissions, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/access.html\">Access Management</a> in the <i>IAM User Guide</i>.</p> </note>"
+      "documentation":"<p>Updates the name and/or the path of the specified server certificate stored in IAM.</p> <p>For more information about working with server certificates, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html\">Working with Server Certificates</a> in the <i>IAM User Guide</i>. This topic also includes a list of AWS services that can use the server certificates that you manage with IAM.</p> <important> <p>You should understand the implications of changing a server certificate's path or name. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs_manage.html#RenamingServerCerts\">Renaming a Server Certificate</a> in the <i>IAM User Guide</i>.</p> </important> <note> <p>The person making the request (the principal), must have permission to change the server certificate with the old name and the new name. For example, to change the certificate named <code>ProductionCert</code> to <code>ProdCert</code>, the principal must have a policy that allows them to update both certificates. If the principal has permission to update the <code>ProductionCert</code> group, but not the <code>ProdCert</code> certificate, then the update fails. For more information about permissions, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/access.html\">Access Management</a> in the <i>IAM User Guide</i>.</p> </note>"
     },
     "UpdateServiceSpecificCredential":{
       "name":"UpdateServiceSpecificCredential",
@@ -1909,7 +1928,7 @@
       "errors":[
         {"shape":"NoSuchEntityException"}
       ],
-      "documentation":"<p>Sets the status of a service-specific credential to <code>Active</code> or <code>Inactive</code>. Service-specific credentials that are inactive cannot be used for authentication to the service. This action can be used to disable a user’s service-specific credential as part of a credential rotation work flow.</p>"
+      "documentation":"<p>Sets the status of a service-specific credential to <code>Active</code> or <code>Inactive</code>. Service-specific credentials that are inactive cannot be used for authentication to the service. This operation can be used to disable a user’s service-specific credential as part of a credential rotation work flow.</p>"
     },
     "UpdateSigningCertificate":{
       "name":"UpdateSigningCertificate",
@@ -1923,7 +1942,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Changes the status of the specified user signing certificate from active to disabled, or vice versa. This action can be used to disable an IAM user's signing certificate as part of a certificate rotation work flow.</p> <p>If the <code>UserName</code> field is not specified, the UserName is determined implicitly based on the AWS access key ID used to sign the request. Because this action works for access keys under the AWS account, you can use this action to manage root credentials even if the AWS account has no associated users.</p>"
+      "documentation":"<p>Changes the status of the specified user signing certificate from active to disabled, or vice versa. This operation can be used to disable an IAM user's signing certificate as part of a certificate rotation work flow.</p> <p>If the <code>UserName</code> field is not specified, the user name is determined implicitly based on the AWS access key ID used to sign the request. Because this operation works for access keys under the AWS account, you can use this operation to manage AWS account root user credentials even if the AWS account has no associated users.</p>"
     },
     "UpdateUser":{
       "name":"UpdateUser",
@@ -1939,7 +1958,7 @@
         {"shape":"EntityTemporarilyUnmodifiableException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Updates the name and/or the path of the specified IAM user.</p> <important> <p> You should understand the implications of changing an IAM user's path or name. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_users_manage.html#id_users_renaming\">Renaming an IAM User</a> and <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_groups_manage_rename.html\">Renaming an IAM Group</a> in the <i>IAM User Guide</i>.</p> </important> <note> <p> To change a user name the requester must have appropriate permissions on both the source object and the target object. For example, to change Bob to Robert, the entity making the request must have permission on Bob and Robert, or must have permission on all (*). For more information about permissions, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/PermissionsAndPolicies.html\">Permissions and Policies</a>. </p> </note>"
+      "documentation":"<p>Updates the name and/or the path of the specified IAM user.</p> <important> <p> You should understand the implications of changing an IAM user's path or name. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_users_manage.html#id_users_renaming\">Renaming an IAM User</a> and <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_groups_manage_rename.html\">Renaming an IAM Group</a> in the <i>IAM User Guide</i>.</p> </important> <note> <p> To change a user name, the requester must have appropriate permissions on both the source object and the target object. For example, to change Bob to Robert, the entity making the request must have permission on Bob and Robert, or must have permission on all (*). For more information about permissions, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/PermissionsAndPolicies.html\">Permissions and Policies</a>. </p> </note>"
     },
     "UploadSSHPublicKey":{
       "name":"UploadSSHPublicKey",
@@ -1959,7 +1978,7 @@
         {"shape":"DuplicateSSHPublicKeyException"},
         {"shape":"UnrecognizedPublicKeyEncodingException"}
       ],
-      "documentation":"<p>Uploads an SSH public key and associates it with the specified IAM user.</p> <p>The SSH public key uploaded by this action can be used only for authenticating the associated IAM user to an AWS CodeCommit repository. For more information about using SSH keys to authenticate to an AWS CodeCommit repository, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html\">Set up AWS CodeCommit for SSH Connections</a> in the <i>AWS CodeCommit User Guide</i>.</p>"
+      "documentation":"<p>Uploads an SSH public key and associates it with the specified IAM user.</p> <p>The SSH public key uploaded by this operation can be used only for authenticating the associated IAM user to an AWS CodeCommit repository. For more information about using SSH keys to authenticate to an AWS CodeCommit repository, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-credentials-ssh.html\">Set up AWS CodeCommit for SSH Connections</a> in the <i>AWS CodeCommit User Guide</i>.</p>"
     },
     "UploadServerCertificate":{
       "name":"UploadServerCertificate",
@@ -1979,7 +1998,7 @@
         {"shape":"KeyPairMismatchException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Uploads a server certificate entity for the AWS account. The server certificate entity includes a public key certificate, a private key, and an optional certificate chain, which should all be PEM-encoded.</p> <p>We recommend that you use <a href=\"https://aws.amazon.com/certificate-manager/\">AWS Certificate Manager</a> to provision, manage, and deploy your server certificates. With ACM you can request a certificate, deploy it to AWS resources, and let ACM handle certificate renewals for you. Certificates provided by ACM are free. For more information about using ACM, see the <a href=\"http://docs.aws.amazon.com/acm/latest/userguide/\">AWS Certificate Manager User Guide</a>.</p> <p>For more information about working with server certificates, including a list of AWS services that can use the server certificates that you manage with IAM, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html\">Working with Server Certificates</a> in the <i>IAM User Guide</i>.</p> <p>For information about the number of server certificates you can upload, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-limits.html\">Limitations on IAM Entities and Objects</a> in the <i>IAM User Guide</i>.</p> <note> <p>Because the body of the public key certificate, private key, and the certificate chain can be large, you should use POST rather than GET when calling <code>UploadServerCertificate</code>. For information about setting up signatures and authorization through the API, go to <a href=\"http://docs.aws.amazon.com/general/latest/gr/signing_aws_api_requests.html\">Signing AWS API Requests</a> in the <i>AWS General Reference</i>. For general information about using the Query API with IAM, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/programming.html\">Calling the API by Making HTTP Query Requests</a> in the <i>IAM User Guide</i>.</p> </note>"
+      "documentation":"<p>Uploads a server certificate entity for the AWS account. The server certificate entity includes a public key certificate, a private key, and an optional certificate chain, which should all be PEM-encoded.</p> <p>We recommend that you use <a href=\"https://aws.amazon.com/certificate-manager/\">AWS Certificate Manager</a> to provision, manage, and deploy your server certificates. With ACM you can request a certificate, deploy it to AWS resources, and let ACM handle certificate renewals for you. Certificates provided by ACM are free. For more information about using ACM, see the <a href=\"http://docs.aws.amazon.com/acm/latest/userguide/\">AWS Certificate Manager User Guide</a>.</p> <p>For more information about working with server certificates, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html\">Working with Server Certificates</a> in the <i>IAM User Guide</i>. This topic includes a list of AWS services that can use the server certificates that you manage with IAM.</p> <p>For information about the number of server certificates you can upload, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-limits.html\">Limitations on IAM Entities and Objects</a> in the <i>IAM User Guide</i>.</p> <note> <p>Because the body of the public key certificate, private key, and the certificate chain can be large, you should use POST rather than GET when calling <code>UploadServerCertificate</code>. For information about setting up signatures and authorization through the API, go to <a href=\"http://docs.aws.amazon.com/general/latest/gr/signing_aws_api_requests.html\">Signing AWS API Requests</a> in the <i>AWS General Reference</i>. For general information about using the Query API with IAM, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/programming.html\">Calling the API by Making HTTP Query Requests</a> in the <i>IAM User Guide</i>.</p> </note>"
     },
     "UploadSigningCertificate":{
       "name":"UploadSigningCertificate",
@@ -2001,7 +2020,7 @@
         {"shape":"NoSuchEntityException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Uploads an X.509 signing certificate and associates it with the specified IAM user. Some AWS services use X.509 signing certificates to validate requests that are signed with a corresponding private key. When you upload the certificate, its default status is <code>Active</code>.</p> <p>If the <code>UserName</code> field is not specified, the IAM user name is determined implicitly based on the AWS access key ID used to sign the request. Because this action works for access keys under the AWS account, you can use this action to manage root credentials even if the AWS account has no associated users.</p> <note> <p>Because the body of a X.509 certificate can be large, you should use POST rather than GET when calling <code>UploadSigningCertificate</code>. For information about setting up signatures and authorization through the API, go to <a href=\"http://docs.aws.amazon.com/general/latest/gr/signing_aws_api_requests.html\">Signing AWS API Requests</a> in the <i>AWS General Reference</i>. For general information about using the Query API with IAM, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/IAM_UsingQueryAPI.html\">Making Query Requests</a> in the <i>IAM User Guide</i>.</p> </note>"
+      "documentation":"<p>Uploads an X.509 signing certificate and associates it with the specified IAM user. Some AWS services use X.509 signing certificates to validate requests that are signed with a corresponding private key. When you upload the certificate, its default status is <code>Active</code>.</p> <p>If the <code>UserName</code> field is not specified, the IAM user name is determined implicitly based on the AWS access key ID used to sign the request. Because this operation works for access keys under the AWS account, you can use this operation to manage AWS account root user credentials even if the AWS account has no associated users.</p> <note> <p>Because the body of an X.509 certificate can be large, you should use POST rather than GET when calling <code>UploadSigningCertificate</code>. For information about setting up signatures and authorization through the API, go to <a href=\"http://docs.aws.amazon.com/general/latest/gr/signing_aws_api_requests.html\">Signing AWS API Requests</a> in the <i>AWS General Reference</i>. For general information about using the Query API with IAM, go to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/IAM_UsingQueryAPI.html\">Making Query Requests</a> in the <i>IAM User Guide</i>.</p> </note>"
     }
   },
   "shapes":{
@@ -2024,7 +2043,7 @@
         },
         "Status":{
           "shape":"statusType",
-          "documentation":"<p>The status of the access key. <code>Active</code> means the key is valid for API calls, while <code>Inactive</code> means it is not. </p>"
+          "documentation":"<p>The status of the access key. <code>Active</code> means that the key is valid for API calls, while <code>Inactive</code> means it is not. </p>"
         },
         "SecretAccessKey":{
           "shape":"accessKeySecretType",
@@ -2035,7 +2054,7 @@
           "documentation":"<p>The date when the access key was created.</p>"
         }
       },
-      "documentation":"<p>Contains information about an AWS access key.</p> <p> This data type is used as a response element in the <a>CreateAccessKey</a> and <a>ListAccessKeys</a> actions. </p> <note> <p>The <code>SecretAccessKey</code> value is returned only in response to <a>CreateAccessKey</a>. You can get a secret access key only when you first create an access key; you cannot recover the secret access key later. If you lose a secret access key, you must create a new access key.</p> </note>"
+      "documentation":"<p>Contains information about an AWS access key.</p> <p> This data type is used as a response element in the <a>CreateAccessKey</a> and <a>ListAccessKeys</a> operations. </p> <note> <p>The <code>SecretAccessKey</code> value is returned only in response to <a>CreateAccessKey</a>. You can get a secret access key only when you first create an access key; you cannot recover the secret access key later. If you lose a secret access key, you must create a new access key.</p> </note>"
     },
     "AccessKeyLastUsed":{
       "type":"structure",
@@ -2047,18 +2066,18 @@
       "members":{
         "LastUsedDate":{
           "shape":"dateType",
-          "documentation":"<p>The date and time, in <a href=\"http://www.iso.org/iso/iso8601\">ISO 8601 date-time format</a>, when the access key was most recently used. This field is null when:</p> <ul> <li> <p>The user does not have an access key.</p> </li> <li> <p>An access key exists but has never been used, at least not since IAM started tracking this information on April 22nd, 2015.</p> </li> <li> <p>There is no sign-in data associated with the user</p> </li> </ul>"
+          "documentation":"<p>The date and time, in <a href=\"http://www.iso.org/iso/iso8601\">ISO 8601 date-time format</a>, when the access key was most recently used. This field is null in the following situations:</p> <ul> <li> <p>The user does not have an access key.</p> </li> <li> <p>An access key exists but has never been used, at least not since IAM started tracking this information on April 22nd, 2015.</p> </li> <li> <p>There is no sign-in data associated with the user</p> </li> </ul>"
         },
         "ServiceName":{
           "shape":"stringType",
-          "documentation":"<p>The name of the AWS service with which this access key was most recently used. This field displays \"N/A\" when:</p> <ul> <li> <p>The user does not have an access key.</p> </li> <li> <p>An access key exists but has never been used, at least not since IAM started tracking this information on April 22nd, 2015.</p> </li> <li> <p>There is no sign-in data associated with the user</p> </li> </ul>"
+          "documentation":"<p>The name of the AWS service with which this access key was most recently used. This field displays \"N/A\" in the following situations:</p> <ul> <li> <p>The user does not have an access key.</p> </li> <li> <p>An access key exists but has never been used, at least not since IAM started tracking this information on April 22nd, 2015.</p> </li> <li> <p>There is no sign-in data associated with the user</p> </li> </ul>"
         },
         "Region":{
           "shape":"stringType",
-          "documentation":"<p>The AWS region where this access key was most recently used. This field is displays \"N/A\" when:</p> <ul> <li> <p>The user does not have an access key.</p> </li> <li> <p>An access key exists but has never been used, at least not since IAM started tracking this information on April 22nd, 2015.</p> </li> <li> <p>There is no sign-in data associated with the user</p> </li> </ul> <p>For more information about AWS regions, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/rande.html\">Regions and Endpoints</a> in the Amazon Web Services General Reference.</p>"
+          "documentation":"<p>The AWS region where this access key was most recently used. This field is displays \"N/A\" in the following situations:</p> <ul> <li> <p>The user does not have an access key.</p> </li> <li> <p>An access key exists but has never been used, at least not since IAM started tracking this information on April 22nd, 2015.</p> </li> <li> <p>There is no sign-in data associated with the user</p> </li> </ul> <p>For more information about AWS regions, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/rande.html\">Regions and Endpoints</a> in the Amazon Web Services General Reference.</p>"
         }
       },
-      "documentation":"<p>Contains information about the last time an AWS access key was used.</p> <p>This data type is used as a response element in the <a>GetAccessKeyLastUsed</a> action.</p>"
+      "documentation":"<p>Contains information about the last time an AWS access key was used.</p> <p>This data type is used as a response element in the <a>GetAccessKeyLastUsed</a> operation.</p>"
     },
     "AccessKeyMetadata":{
       "type":"structure",
@@ -2080,7 +2099,7 @@
           "documentation":"<p>The date when the access key was created.</p>"
         }
       },
-      "documentation":"<p>Contains information about an AWS access key, without its secret key.</p> <p>This data type is used as a response element in the <a>ListAccessKeys</a> action.</p>"
+      "documentation":"<p>Contains information about an AWS access key, without its secret key.</p> <p>This data type is used as a response element in the <a>ListAccessKeys</a> operation.</p>"
     },
     "ActionNameListType":{
       "type":"list",
@@ -2100,7 +2119,7 @@
       "members":{
         "OpenIDConnectProviderArn":{
           "shape":"arnType",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM OpenID Connect (OIDC) provider resource to add the client ID to. You can get a list of OIDC provider ARNs by using the <a>ListOpenIDConnectProviders</a> action.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM OpenID Connect (OIDC) provider resource to add the client ID to. You can get a list of OIDC provider ARNs by using the <a>ListOpenIDConnectProviders</a> operation.</p>"
         },
         "ClientID":{
           "shape":"clientIDType",
@@ -2117,7 +2136,7 @@
       "members":{
         "InstanceProfileName":{
           "shape":"instanceProfileNameType",
-          "documentation":"<p>The name of the instance profile to update.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the instance profile to update.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "RoleName":{
           "shape":"roleNameType",
@@ -2134,11 +2153,11 @@
       "members":{
         "GroupName":{
           "shape":"groupNameType",
-          "documentation":"<p>The name of the group to update.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the group to update.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the user to add.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user to add.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -2155,7 +2174,7 @@
       "members":{
         "GroupName":{
           "shape":"groupNameType",
-          "documentation":"<p>The name (friendly name, not ARN) of the group to attach the policy to.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name (friendly name, not ARN) of the group to attach the policy to.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "PolicyArn":{
           "shape":"arnType",
@@ -2189,7 +2208,7 @@
       "members":{
         "UserName":{
           "shape":"userNameType",
-          "documentation":"<p>The name (friendly name, not ARN) of the IAM user to attach the policy to.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name (friendly name, not ARN) of the IAM user to attach the policy to.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "PolicyArn":{
           "shape":"arnType",
@@ -2206,7 +2225,7 @@
         },
         "PolicyArn":{"shape":"arnType"}
       },
-      "documentation":"<p>Contains information about an attached policy.</p> <p>An attached policy is a managed policy that has been attached to a user, group, or role. This data type is used as a response element in the <a>ListAttachedGroupPolicies</a>, <a>ListAttachedRolePolicies</a>, <a>ListAttachedUserPolicies</a>, and <a>GetAccountAuthorizationDetails</a> actions. </p> <p>For more information about managed policies, refer to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
+      "documentation":"<p>Contains information about an attached policy.</p> <p>An attached policy is a managed policy that has been attached to a user, group, or role. This data type is used as a response element in the <a>ListAttachedGroupPolicies</a>, <a>ListAttachedRolePolicies</a>, <a>ListAttachedUserPolicies</a>, and <a>GetAccountAuthorizationDetails</a> operations. </p> <p>For more information about managed policies, refer to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
     },
     "BootstrapDatum":{
       "type":"blob",
@@ -2225,7 +2244,7 @@
         },
         "NewPassword":{
           "shape":"passwordType",
-          "documentation":"<p>The new password. The new password must conform to the AWS account's password policy, if one exists.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of almost any printable ASCII character from the space (\\u0020) through the end of the ASCII character range (\\u00FF). You can also include the tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D) characters. Although any of these characters are valid in a password, note that many tools, such as the AWS Management Console, might restrict the ability to enter certain characters because they have special meaning within that tool.</p>"
+          "documentation":"<p>The new password. The new password must conform to the AWS account's password policy, if one exists.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> that is used to validate this parameter is a string of characters. That string can include almost any printable ASCII character from the space (\\u0020) through the end of the ASCII character range (\\u00FF). You can also include the tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D) characters. Any of these characters are valid in a password. However, many tools, such as the AWS Management Console, might restrict the ability to type certain characters because they have special meaning within that tool.</p>"
         }
       }
     },
@@ -2239,7 +2258,7 @@
         },
         "ContextKeyValues":{
           "shape":"ContextKeyValueListType",
-          "documentation":"<p>The value (or values, if the condition context key supports multiple values) to provide to the simulation for use when the key is referenced by a <code>Condition</code> element in an input policy.</p>"
+          "documentation":"<p>The value (or values, if the condition context key supports multiple values) to provide to the simulation when the key is referenced by a <code>Condition</code> element in an input policy.</p>"
         },
         "ContextKeyType":{
           "shape":"ContextKeyTypeEnum",
@@ -2288,7 +2307,7 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the IAM user that the new key will belong to.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the IAM user that the new key will belong to.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -2319,11 +2338,11 @@
       "members":{
         "Path":{
           "shape":"pathType",
-          "documentation":"<p> The path to the group. For more information about paths, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path to the group. For more information about paths, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "GroupName":{
           "shape":"groupNameType",
-          "documentation":"<p>The name of the group to create. Do not include the path in this value.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-. The group name must be unique within the account. Group names are not distinguished by case. For example, you cannot create groups named both \"ADMINS\" and \"admins\".</p>"
+          "documentation":"<p>The name of the group to create. Do not include the path in this value.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-. The group name must be unique within the account. Group names are not distinguished by case. For example, you cannot create groups named both \"ADMINS\" and \"admins\".</p>"
         }
       }
     },
@@ -2344,11 +2363,11 @@
       "members":{
         "InstanceProfileName":{
           "shape":"instanceProfileNameType",
-          "documentation":"<p>The name of the instance profile to create.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the instance profile to create.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "Path":{
           "shape":"pathType",
-          "documentation":"<p> The path to the instance profile. For more information about paths, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path to the instance profile. For more information about paths, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         }
       }
     },
@@ -2372,11 +2391,11 @@
       "members":{
         "UserName":{
           "shape":"userNameType",
-          "documentation":"<p>The name of the IAM user to create a password for. The user must already exist.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the IAM user to create a password for. The user must already exist.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "Password":{
           "shape":"passwordType",
-          "documentation":"<p>The new password for the user.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of almost any printable ASCII character from the space (\\u0020) through the end of the ASCII character range (\\u00FF). You can also include the tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D) characters. Although any of these characters are valid in a password, note that many tools, such as the AWS Management Console, might restrict the ability to enter certain characters because they have special meaning within that tool.</p>"
+          "documentation":"<p>The new password for the user.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> that is used to validate this parameter is a string of characters. That string can include almost any printable ASCII character from the space (\\u0020) through the end of the ASCII character range (\\u00FF). You can also include the tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D) characters. Any of these characters are valid in a password. However, many tools, such as the AWS Management Console, might restrict the ability to type certain characters because they have special meaning within that tool.</p>"
         },
         "PasswordResetRequired":{
           "shape":"booleanType",
@@ -2404,15 +2423,15 @@
       "members":{
         "Url":{
           "shape":"OpenIDConnectProviderUrlType",
-          "documentation":"<p>The URL of the identity provider. The URL must begin with \"https://\" and should correspond to the <code>iss</code> claim in the provider's OpenID Connect ID tokens. Per the OIDC standard, path components are allowed but query parameters are not. Typically the URL consists of only a host name, like \"https://server.example.org\" or \"https://example.com\".</p> <p>You cannot register the same provider multiple times in a single AWS account. If you try to submit a URL that has already been used for an OpenID Connect provider in the AWS account, you will get an error.</p>"
+          "documentation":"<p>The URL of the identity provider. The URL must begin with <code>https://</code> and should correspond to the <code>iss</code> claim in the provider's OpenID Connect ID tokens. Per the OIDC standard, path components are allowed but query parameters are not. Typically the URL consists of only a hostname, like <code>https://server.example.org</code> or <code>https://example.com</code>.</p> <p>You cannot register the same provider multiple times in a single AWS account. If you try to submit a URL that has already been used for an OpenID Connect provider in the AWS account, you will get an error.</p>"
         },
         "ClientIDList":{
           "shape":"clientIDListType",
-          "documentation":"<p>A list of client IDs (also known as audiences). When a mobile or web app registers with an OpenID Connect provider, they establish a value that identifies the application. (This is the value that's sent as the <code>client_id</code> parameter on OAuth requests.)</p> <p>You can register multiple client IDs with the same provider. For example, you might have multiple applications that use the same OIDC provider. You cannot register more than 100 client IDs with a single IAM OIDC provider.</p> <p>There is no defined format for a client ID. The <code>CreateOpenIDConnectProviderRequest</code> action accepts client IDs up to 255 characters long.</p>"
+          "documentation":"<p>A list of client IDs (also known as audiences). When a mobile or web app registers with an OpenID Connect provider, they establish a value that identifies the application. (This is the value that's sent as the <code>client_id</code> parameter on OAuth requests.)</p> <p>You can register multiple client IDs with the same provider. For example, you might have multiple applications that use the same OIDC provider. You cannot register more than 100 client IDs with a single IAM OIDC provider.</p> <p>There is no defined format for a client ID. The <code>CreateOpenIDConnectProviderRequest</code> operation accepts client IDs up to 255 characters long.</p>"
         },
         "ThumbprintList":{
           "shape":"thumbprintListType",
-          "documentation":"<p>A list of server certificate thumbprints for the OpenID Connect (OIDC) identity provider's server certificate(s). Typically this list includes only one entry. However, IAM lets you have up to five thumbprints for an OIDC provider. This lets you maintain multiple thumbprints if the identity provider is rotating certificates.</p> <p>The server certificate thumbprint is the hex-encoded SHA-1 hash value of the X.509 certificate used by the domain where the OpenID Connect provider makes its keys available. It is always a 40-character string.</p> <p>You must provide at least one thumbprint when creating an IAM OIDC provider. For example, if the OIDC provider is <code>server.example.com</code> and the provider stores its keys at \"https://keys.server.example.com/openid-connect\", the thumbprint string would be the hex-encoded SHA-1 hash value of the certificate used by https://keys.server.example.com.</p> <p>For more information about obtaining the OIDC provider's thumbprint, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/identity-providers-oidc-obtain-thumbprint.html\">Obtaining the Thumbprint for an OpenID Connect Provider</a> in the <i>IAM User Guide</i>.</p>"
+          "documentation":"<p>A list of server certificate thumbprints for the OpenID Connect (OIDC) identity provider's server certificates. Typically this list includes only one entry. However, IAM lets you have up to five thumbprints for an OIDC provider. This lets you maintain multiple thumbprints if the identity provider is rotating certificates.</p> <p>The server certificate thumbprint is the hex-encoded SHA-1 hash value of the X.509 certificate used by the domain where the OpenID Connect provider makes its keys available. It is always a 40-character string.</p> <p>You must provide at least one thumbprint when creating an IAM OIDC provider. For example, assume that the OIDC provider is <code>server.example.com</code> and the provider stores its keys at https://keys.server.example.com/openid-connect. In that case, the thumbprint string would be the hex-encoded SHA-1 hash value of the certificate used by https://keys.server.example.com.</p> <p>For more information about obtaining the OIDC provider's thumbprint, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/identity-providers-oidc-obtain-thumbprint.html\">Obtaining the Thumbprint for an OpenID Connect Provider</a> in the <i>IAM User Guide</i>.</p>"
         }
       }
     },
@@ -2435,15 +2454,15 @@
       "members":{
         "PolicyName":{
           "shape":"policyNameType",
-          "documentation":"<p>The friendly name of the policy.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-+</p>"
+          "documentation":"<p>The friendly name of the policy.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "Path":{
           "shape":"policyPathType",
-          "documentation":"<p>The path for the policy.</p> <p>For more information about paths, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p>The path for the policy.</p> <p>For more information about paths, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "PolicyDocument":{
           "shape":"policyDocumentType",
-          "documentation":"<p>The JSON policy document that you want to use as the content for the new policy.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D).</p>"
+          "documentation":"<p>The JSON policy document that you want to use as the content for the new policy.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
         },
         "Description":{
           "shape":"policyDescriptionType",
@@ -2474,11 +2493,11 @@
         },
         "PolicyDocument":{
           "shape":"policyDocumentType",
-          "documentation":"<p>The JSON policy document that you want to use as the content for this new version of the policy.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D).</p>"
+          "documentation":"<p>The JSON policy document that you want to use as the content for this new version of the policy.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
         },
         "SetAsDefault":{
           "shape":"booleanType",
-          "documentation":"<p>Specifies whether to set this version as the policy's default version.</p> <p>When this parameter is <code>true</code>, the new policy version becomes the operative version; that is, the version that is in effect for the IAM users, groups, and roles that the policy is attached to.</p> <p>For more information about managed policy versions, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-versions.html\">Versioning for Managed Policies</a> in the <i>IAM User Guide</i>.</p>"
+          "documentation":"<p>Specifies whether to set this version as the policy's default version.</p> <p>When this parameter is <code>true</code>, the new policy version becomes the operative version. That is, it becomes the version that is in effect for the IAM users, groups, and roles that the policy is attached to.</p> <p>For more information about managed policy versions, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-versions.html\">Versioning for Managed Policies</a> in the <i>IAM User Guide</i>.</p>"
         }
       }
     },
@@ -2501,7 +2520,7 @@
       "members":{
         "Path":{
           "shape":"pathType",
-          "documentation":"<p> The path to the role. For more information about paths, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path to the role. For more information about paths, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "RoleName":{
           "shape":"roleNameType",
@@ -2509,11 +2528,15 @@
         },
         "AssumeRolePolicyDocument":{
           "shape":"policyDocumentType",
-          "documentation":"<p>The trust relationship policy document that grants an entity permission to assume the role.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D).</p>"
+          "documentation":"<p>The trust relationship policy document that grants an entity permission to assume the role.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
         },
         "Description":{
           "shape":"roleDescriptionType",
-          "documentation":"<p>A customer-provided description of the role.</p>"
+          "documentation":"<p>A description of the role.</p>"
+        },
+        "MaxSessionDuration":{
+          "shape":"roleMaxSessionDurationType",
+          "documentation":"<p>The maximum session duration (in seconds) that you want to set for the specified role. If you do not specify a value for this setting, the default maximum of one hour is applied. This setting can have a value from 1 hour to 12 hours.</p> <p>Anyone who assumes the role from the AWS CLI or API can use the <code>DurationSeconds</code> API parameter or the <code>duration-seconds</code> CLI parameter to request a longer session. The <code>MaxSessionDuration</code> setting determines the maximum duration that can be requested using the <code>DurationSeconds</code> parameter. If users don't specify a value for the <code>DurationSeconds</code> parameter, their security credentials are valid for one hour by default. This applies when you use the <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI operations but does not apply when you use those operations to create a console URL. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html\">Using IAM Roles</a> in the <i>IAM User Guide</i>.</p>"
         }
       }
     },
@@ -2541,7 +2564,7 @@
         },
         "Name":{
           "shape":"SAMLProviderNameType",
-          "documentation":"<p>The name of the provider to create.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the provider to create.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -2591,7 +2614,7 @@
       "members":{
         "UserName":{
           "shape":"userNameType",
-          "documentation":"<p>The name of the IAM user that is to be associated with the credentials. The new service-specific credentials have the same permissions as the associated user except that they can be used only to access the specified service.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the IAM user that is to be associated with the credentials. The new service-specific credentials have the same permissions as the associated user except that they can be used only to access the specified service.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "ServiceName":{
           "shape":"serviceName",
@@ -2614,11 +2637,11 @@
       "members":{
         "Path":{
           "shape":"pathType",
-          "documentation":"<p> The path for the user name. For more information about paths, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path for the user name. For more information about paths, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "UserName":{
           "shape":"userNameType",
-          "documentation":"<p>The name of the user to create.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-. User names are not distinguished by case. For example, you cannot create users named both \"TESTUSER\" and \"testuser\".</p>"
+          "documentation":"<p>The name of the user to create.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-. User names are not distinguished by case. For example, you cannot create users named both \"TESTUSER\" and \"testuser\".</p>"
         }
       }
     },
@@ -2638,11 +2661,11 @@
       "members":{
         "Path":{
           "shape":"pathType",
-          "documentation":"<p> The path for the virtual MFA device. For more information about paths, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path for the virtual MFA device. For more information about paths, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "VirtualMFADeviceName":{
           "shape":"virtualMFADeviceName",
-          "documentation":"<p>The name of the virtual MFA device. Use with path to uniquely identify a virtual MFA device.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the virtual MFA device. Use with path to uniquely identify a virtual MFA device.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -2705,7 +2728,7 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the user whose MFA device you want to deactivate.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user whose MFA device you want to deactivate.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "SerialNumber":{
           "shape":"serialNumberType",
@@ -2719,7 +2742,7 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the user whose access key pair you want to delete.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user whose access key pair you want to delete.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "AccessKeyId":{
           "shape":"accessKeyIdType",
@@ -2759,11 +2782,11 @@
       "members":{
         "GroupName":{
           "shape":"groupNameType",
-          "documentation":"<p>The name (friendly name, not ARN) identifying the group that the policy is embedded in.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name (friendly name, not ARN) identifying the group that the policy is embedded in.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "PolicyName":{
           "shape":"policyNameType",
-          "documentation":"<p>The name identifying the policy document to delete.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-+</p>"
+          "documentation":"<p>The name identifying the policy document to delete.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -2773,7 +2796,7 @@
       "members":{
         "GroupName":{
           "shape":"groupNameType",
-          "documentation":"<p>The name of the IAM group to delete.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the IAM group to delete.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -2783,7 +2806,7 @@
       "members":{
         "InstanceProfileName":{
           "shape":"instanceProfileNameType",
-          "documentation":"<p>The name of the instance profile to delete.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the instance profile to delete.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -2793,7 +2816,7 @@
       "members":{
         "UserName":{
           "shape":"userNameType",
-          "documentation":"<p>The name of the user whose password you want to delete.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user whose password you want to delete.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -2803,7 +2826,7 @@
       "members":{
         "OpenIDConnectProviderArn":{
           "shape":"arnType",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM OpenID Connect provider resource object to delete. You can get a list of OpenID Connect provider resource ARNs by using the <a>ListOpenIDConnectProviders</a> action.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM OpenID Connect provider resource object to delete. You can get a list of OpenID Connect provider resource ARNs by using the <a>ListOpenIDConnectProviders</a> operation.</p>"
         }
       }
     },
@@ -2847,7 +2870,7 @@
         },
         "PolicyName":{
           "shape":"policyNameType",
-          "documentation":"<p>The name of the inline policy to delete from the specified IAM role.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-+</p>"
+          "documentation":"<p>The name of the inline policy to delete from the specified IAM role.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -2880,7 +2903,7 @@
       "members":{
         "UserName":{
           "shape":"userNameType",
-          "documentation":"<p>The name of the IAM user associated with the SSH public key.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the IAM user associated with the SSH public key.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "SSHPublicKeyId":{
           "shape":"publicKeyIdType",
@@ -2894,7 +2917,7 @@
       "members":{
         "ServerCertificateName":{
           "shape":"serverCertificateNameType",
-          "documentation":"<p>The name of the server certificate you want to delete.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the server certificate you want to delete.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -2924,7 +2947,7 @@
       "members":{
         "UserName":{
           "shape":"userNameType",
-          "documentation":"<p>The name of the IAM user associated with the service-specific credential. If this value is not specified, then the operation assumes the user whose credentials are used to call the operation.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the IAM user associated with the service-specific credential. If this value is not specified, then the operation assumes the user whose credentials are used to call the operation.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "ServiceSpecificCredentialId":{
           "shape":"serviceSpecificCredentialId",
@@ -2938,7 +2961,7 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the user the signing certificate belongs to.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user the signing certificate belongs to.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "CertificateId":{
           "shape":"certificateIdType",
@@ -2955,11 +2978,11 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name (friendly name, not ARN) identifying the user that the policy is embedded in.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name (friendly name, not ARN) identifying the user that the policy is embedded in.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "PolicyName":{
           "shape":"policyNameType",
-          "documentation":"<p>The name identifying the policy document to delete.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-+</p>"
+          "documentation":"<p>The name identifying the policy document to delete.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -2969,7 +2992,7 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the user to delete.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user to delete.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -2992,7 +3015,7 @@
         },
         "RoleUsageList":{
           "shape":"RoleUsageListType",
-          "documentation":"<p>A list of objects that contains details about the service-linked role deletion failure. If the service-linked role has active sessions or if any resources that were used by the role have not been deleted from the linked service, the role can't be deleted. This parameter includes a list of the resources that are associated with the role and the region in which the resources are being used.</p>"
+          "documentation":"<p>A list of objects that contains details about the service-linked role deletion failure, if that information is returned by the service. If the service-linked role has active sessions or if any resources that were used by the role have not been deleted from the linked service, the role can't be deleted. This parameter includes a list of the resources that are associated with the role and the region in which the resources are being used.</p>"
         }
       },
       "documentation":"<p>The reason that the service-linked role deletion failed.</p> <p>This data type is used as a response element in the <a>GetServiceLinkedRoleDeletionStatus</a> operation.</p>"
@@ -3020,7 +3043,7 @@
       "members":{
         "GroupName":{
           "shape":"groupNameType",
-          "documentation":"<p>The name (friendly name, not ARN) of the IAM group to detach the policy from.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name (friendly name, not ARN) of the IAM group to detach the policy from.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "PolicyArn":{
           "shape":"arnType",
@@ -3054,7 +3077,7 @@
       "members":{
         "UserName":{
           "shape":"userNameType",
-          "documentation":"<p>The name (friendly name, not ARN) of the IAM user to detach the policy from.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name (friendly name, not ARN) of the IAM user to detach the policy from.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "PolicyArn":{
           "shape":"arnType",
@@ -3099,7 +3122,7 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the IAM user for whom you want to enable the MFA device.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the IAM user for whom you want to enable the MFA device.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "SerialNumber":{
           "shape":"serialNumberType",
@@ -3107,11 +3130,11 @@
         },
         "AuthenticationCode1":{
           "shape":"authenticationCodeType",
-          "documentation":"<p>An authentication code emitted by the device. </p> <p>The format for this parameter is a string of 6 digits.</p> <important> <p>Submit your request immediately after generating the authentication codes. If you generate the codes and then wait too long to submit the request, the MFA device successfully associates with the user but the MFA device becomes out of sync. This happens because time-based one-time passwords (TOTP) expire after a short period of time. If this happens, you can <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_mfa_sync.html\">resync the device</a>.</p> </important>"
+          "documentation":"<p>An authentication code emitted by the device. </p> <p>The format for this parameter is a string of six digits.</p> <important> <p>Submit your request immediately after generating the authentication codes. If you generate the codes and then wait too long to submit the request, the MFA device successfully associates with the user but the MFA device becomes out of sync. This happens because time-based one-time passwords (TOTP) expire after a short period of time. If this happens, you can <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_mfa_sync.html\">resync the device</a>.</p> </important>"
         },
         "AuthenticationCode2":{
           "shape":"authenticationCodeType",
-          "documentation":"<p>A subsequent authentication code emitted by the device.</p> <p>The format for this parameter is a string of 6 digits.</p> <important> <p>Submit your request immediately after generating the authentication codes. If you generate the codes and then wait too long to submit the request, the MFA device successfully associates with the user but the MFA device becomes out of sync. This happens because time-based one-time passwords (TOTP) expire after a short period of time. If this happens, you can <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_mfa_sync.html\">resync the device</a>.</p> </important>"
+          "documentation":"<p>A subsequent authentication code emitted by the device.</p> <p>The format for this parameter is a string of six digits.</p> <important> <p>Submit your request immediately after generating the authentication codes. If you generate the codes and then wait too long to submit the request, the MFA device successfully associates with the user but the MFA device becomes out of sync. This happens because time-based one-time passwords (TOTP) expire after a short period of time. If this happens, you can <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_mfa_sync.html\">resync the device</a>.</p> </important>"
         }
       }
     },
@@ -3170,11 +3193,11 @@
       "members":{
         "EvalActionName":{
           "shape":"ActionNameType",
-          "documentation":"<p>The name of the API action tested on the indicated resource.</p>"
+          "documentation":"<p>The name of the API operation tested on the indicated resource.</p>"
         },
         "EvalResourceName":{
           "shape":"ResourceNameType",
-          "documentation":"<p>The ARN of the resource that the indicated API action was tested on.</p>"
+          "documentation":"<p>The ARN of the resource that the indicated API operation was tested on.</p>"
         },
         "EvalDecision":{
           "shape":"PolicyEvaluationDecisionType",
@@ -3182,7 +3205,7 @@
         },
         "MatchedStatements":{
           "shape":"StatementListType",
-          "documentation":"<p>A list of the statements in the input policies that determine the result for this scenario. Remember that even if multiple statements allow the action on the resource, if only one statement denies that action, then the explicit deny overrides any allow, and the deny statement is the only entry included in the result.</p>"
+          "documentation":"<p>A list of the statements in the input policies that determine the result for this scenario. Remember that even if multiple statements allow the operation on the resource, if only one statement denies that operation, then the explicit deny overrides any allow, and the deny statement is the only entry included in the result.</p>"
         },
         "MissingContextValues":{
           "shape":"ContextKeyNamesResultListType",
@@ -3198,7 +3221,7 @@
         },
         "ResourceSpecificResults":{
           "shape":"ResourceSpecificResultListType",
-          "documentation":"<p>The individual results of the simulation of the API action specified in EvalActionName on each resource.</p>"
+          "documentation":"<p>The individual results of the simulation of the API operation specified in EvalActionName on each resource.</p>"
         }
       },
       "documentation":"<p>Contains the results of a simulation.</p> <p>This data type is used by the return parameter of <code> <a>SimulateCustomPolicy</a> </code> and <code> <a>SimulatePrincipalPolicy</a> </code>.</p>"
@@ -3319,7 +3342,7 @@
       "members":{
         "PolicyInputList":{
           "shape":"SimulationPolicyListType",
-          "documentation":"<p>A list of policies for which you want the list of context keys referenced in those policies. Each document is specified as a string containing the complete, valid JSON text of an IAM policy.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D).</p>"
+          "documentation":"<p>A list of policies for which you want the list of context keys referenced in those policies. Each document is specified as a string containing the complete, valid JSON text of an IAM policy.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
         }
       }
     },
@@ -3339,11 +3362,11 @@
       "members":{
         "PolicySourceArn":{
           "shape":"arnType",
-          "documentation":"<p>The ARN of a user, group, or role whose policies contain the context keys that you want listed. If you specify a user, the list includes context keys that are found in all policies attached to the user as well as to all groups that the user is a member of. If you pick a group or a role, then it includes only those context keys that are found in policies attached to that entity. Note that all parameters are shown in unencoded form here for clarity, but must be URL encoded to be included as a part of a real HTML request.</p> <p>For more information about ARNs, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General Reference</i>.</p>"
+          "documentation":"<p>The ARN of a user, group, or role whose policies contain the context keys that you want listed. If you specify a user, the list includes context keys that are found in all policies that are attached to the user. The list also includes all groups that the user is a member of. If you pick a group or a role, then it includes only those context keys that are found in policies attached to that entity. Note that all parameters are shown in unencoded form here for clarity, but must be URL encoded to be included as a part of a real HTML request.</p> <p>For more information about ARNs, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General Reference</i>.</p>"
         },
         "PolicyInputList":{
           "shape":"SimulationPolicyListType",
-          "documentation":"<p>An optional list of additional policies for which you want the list of context keys that are referenced.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D).</p>"
+          "documentation":"<p>An optional list of additional policies for which you want the list of context keys that are referenced.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
         }
       }
     },
@@ -3374,11 +3397,11 @@
       "members":{
         "GroupName":{
           "shape":"groupNameType",
-          "documentation":"<p>The name of the group the policy is associated with.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the group the policy is associated with.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "PolicyName":{
           "shape":"policyNameType",
-          "documentation":"<p>The name of the policy document to get.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-+</p>"
+          "documentation":"<p>The name of the policy document to get.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -3411,7 +3434,7 @@
       "members":{
         "GroupName":{
           "shape":"groupNameType",
-          "documentation":"<p>The name of the group.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the group.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -3455,7 +3478,7 @@
       "members":{
         "InstanceProfileName":{
           "shape":"instanceProfileNameType",
-          "documentation":"<p>The name of the instance profile to get information about.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the instance profile to get information about.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -3476,7 +3499,7 @@
       "members":{
         "UserName":{
           "shape":"userNameType",
-          "documentation":"<p>The name of the user whose login profile you want to retrieve.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user whose login profile you want to retrieve.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -3497,7 +3520,7 @@
       "members":{
         "OpenIDConnectProviderArn":{
           "shape":"arnType",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the OIDC provider resource object in IAM to get information for. You can get a list of OIDC provider resource ARNs by using the <a>ListOpenIDConnectProviders</a> action.</p> <p>For more information about ARNs, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General Reference</i>.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the OIDC provider resource object in IAM to get information for. You can get a list of OIDC provider resource ARNs by using the <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more information about ARNs, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General Reference</i>.</p>"
         }
       }
     },
@@ -3583,7 +3606,7 @@
         },
         "PolicyName":{
           "shape":"policyNameType",
-          "documentation":"<p>The name of the policy document to get.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-+</p>"
+          "documentation":"<p>The name of the policy document to get.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -3669,7 +3692,7 @@
       "members":{
         "UserName":{
           "shape":"userNameType",
-          "documentation":"<p>The name of the IAM user associated with the SSH public key.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the IAM user associated with the SSH public key.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "SSHPublicKeyId":{
           "shape":"publicKeyIdType",
@@ -3697,7 +3720,7 @@
       "members":{
         "ServerCertificateName":{
           "shape":"serverCertificateNameType",
-          "documentation":"<p>The name of the server certificate you want to retrieve information about.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the server certificate you want to retrieve information about.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -3745,11 +3768,11 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the user who the policy is associated with.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user who the policy is associated with.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "PolicyName":{
           "shape":"policyNameType",
-          "documentation":"<p>The name of the policy document to get.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-+</p>"
+          "documentation":"<p>The name of the policy document to get.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -3781,7 +3804,7 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the user to get information about.</p> <p>This parameter is optional. If it is not included, it defaults to the user making the request. This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user to get information about.</p> <p>This parameter is optional. If it is not included, it defaults to the user making the request. This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -3827,7 +3850,7 @@
           "documentation":"<p>The date and time, in <a href=\"http://www.iso.org/iso/iso8601\">ISO 8601 date-time format</a>, when the group was created.</p>"
         }
       },
-      "documentation":"<p>Contains information about an IAM group entity.</p> <p>This data type is used as a response element in the following actions:</p> <ul> <li> <p> <a>CreateGroup</a> </p> </li> <li> <p> <a>GetGroup</a> </p> </li> <li> <p> <a>ListGroups</a> </p> </li> </ul>"
+      "documentation":"<p>Contains information about an IAM group entity.</p> <p>This data type is used as a response element in the following operations:</p> <ul> <li> <p> <a>CreateGroup</a> </p> </li> <li> <p> <a>GetGroup</a> </p> </li> <li> <p> <a>ListGroups</a> </p> </li> </ul>"
     },
     "GroupDetail":{
       "type":"structure",
@@ -3858,7 +3881,7 @@
           "documentation":"<p>A list of the managed policies attached to the group.</p>"
         }
       },
-      "documentation":"<p>Contains information about an IAM group, including all of the group's policies.</p> <p>This data type is used as a response element in the <a>GetAccountAuthorizationDetails</a> action.</p>"
+      "documentation":"<p>Contains information about an IAM group, including all of the group's policies.</p> <p>This data type is used as a response element in the <a>GetAccountAuthorizationDetails</a> operation.</p>"
     },
     "InstanceProfile":{
       "type":"structure",
@@ -3896,7 +3919,7 @@
           "documentation":"<p>The role associated with the instance profile.</p>"
         }
       },
-      "documentation":"<p>Contains information about an instance profile.</p> <p>This data type is used as a response element in the following actions:</p> <ul> <li> <p> <a>CreateInstanceProfile</a> </p> </li> <li> <p> <a>GetInstanceProfile</a> </p> </li> <li> <p> <a>ListInstanceProfiles</a> </p> </li> <li> <p> <a>ListInstanceProfilesForRole</a> </p> </li> </ul>"
+      "documentation":"<p>Contains information about an instance profile.</p> <p>This data type is used as a response element in the following operations:</p> <ul> <li> <p> <a>CreateInstanceProfile</a> </p> </li> <li> <p> <a>GetInstanceProfile</a> </p> </li> <li> <p> <a>ListInstanceProfiles</a> </p> </li> <li> <p> <a>ListInstanceProfilesForRole</a> </p> </li> </ul>"
     },
     "InvalidAuthenticationCodeException":{
       "type":"structure",
@@ -3995,7 +4018,7 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the user.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4064,11 +4087,11 @@
       "members":{
         "GroupName":{
           "shape":"groupNameType",
-          "documentation":"<p>The name (friendly name, not ARN) of the group to list attached policies for.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name (friendly name, not ARN) of the group to list attached policies for.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "PathPrefix":{
           "shape":"policyPathType",
-          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies.</p> <p>This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4108,7 +4131,7 @@
         },
         "PathPrefix":{
           "shape":"policyPathType",
-          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies.</p> <p>This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4144,11 +4167,11 @@
       "members":{
         "UserName":{
           "shape":"userNameType",
-          "documentation":"<p>The name (friendly name, not ARN) of the user to list attached policies for.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name (friendly name, not ARN) of the user to list attached policies for.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "PathPrefix":{
           "shape":"policyPathType",
-          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies.</p> <p>This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4192,7 +4215,7 @@
         },
         "PathPrefix":{
           "shape":"pathType",
-          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all entities.</p> <p>This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all entities.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4236,7 +4259,7 @@
       "members":{
         "GroupName":{
           "shape":"groupNameType",
-          "documentation":"<p>The name of the group to list policies for.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the group to list policies for.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4254,7 +4277,7 @@
       "members":{
         "PolicyNames":{
           "shape":"policyNameListType",
-          "documentation":"<p>A list of policy names.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-+</p>"
+          "documentation":"<p>A list of policy names.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "IsTruncated":{
           "shape":"booleanType",
@@ -4273,7 +4296,7 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the user to list groups for.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user to list groups for.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4309,7 +4332,7 @@
       "members":{
         "PathPrefix":{
           "shape":"pathPrefixType",
-          "documentation":"<p> The path prefix for filtering the results. For example, the prefix <code>/division_abc/subdivision_xyz/</code> gets all groups whose path starts with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all groups. This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path prefix for filtering the results. For example, the prefix <code>/division_abc/subdivision_xyz/</code> gets all groups whose path starts with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all groups. This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4382,7 +4405,7 @@
       "members":{
         "PathPrefix":{
           "shape":"pathPrefixType",
-          "documentation":"<p> The path prefix for filtering the results. For example, the prefix <code>/application_abc/component_xyz/</code> gets all instance profiles whose path starts with <code>/application_abc/component_xyz/</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all instance profiles. This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path prefix for filtering the results. For example, the prefix <code>/application_abc/component_xyz/</code> gets all instance profiles whose path starts with <code>/application_abc/component_xyz/</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all instance profiles. This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4418,7 +4441,7 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the user whose MFA devices you want to list.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user whose MFA devices you want to list.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4477,7 +4500,7 @@
         },
         "PathPrefix":{
           "shape":"policyPathType",
-          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies. This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies. This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4585,7 +4608,7 @@
       "members":{
         "PathPrefix":{
           "shape":"pathPrefixType",
-          "documentation":"<p> The path prefix for filtering the results. For example, the prefix <code>/application_abc/component_xyz/</code> gets all roles whose path starts with <code>/application_abc/component_xyz/</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all roles. This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path prefix for filtering the results. For example, the prefix <code>/application_abc/component_xyz/</code> gets all roles whose path starts with <code>/application_abc/component_xyz/</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all roles. This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4636,7 +4659,7 @@
       "members":{
         "UserName":{
           "shape":"userNameType",
-          "documentation":"<p>The name of the IAM user to list SSH public keys for. If none is specified, the UserName field is determined implicitly based on the AWS access key used to sign the request.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the IAM user to list SSH public keys for. If none is specified, the <code>UserName</code> field is determined implicitly based on the AWS access key used to sign the request.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4671,7 +4694,7 @@
       "members":{
         "PathPrefix":{
           "shape":"pathPrefixType",
-          "documentation":"<p> The path prefix for filtering the results. For example: <code>/company/servercerts</code> would get all server certificates for which the path starts with <code>/company/servercerts</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all server certificates. This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path prefix for filtering the results. For example: <code>/company/servercerts</code> would get all server certificates for which the path starts with <code>/company/servercerts</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all server certificates. This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4707,7 +4730,7 @@
       "members":{
         "UserName":{
           "shape":"userNameType",
-          "documentation":"<p>The name of the user whose service-specific credentials you want information about. If this value is not specified then the operation assumes the user whose credentials are used to call the operation.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user whose service-specific credentials you want information about. If this value is not specified, then the operation assumes the user whose credentials are used to call the operation.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "ServiceName":{
           "shape":"serviceName",
@@ -4729,7 +4752,7 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the IAM user whose signing certificates you want to examine.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the IAM user whose signing certificates you want to examine.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4766,7 +4789,7 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the user to list policies for.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user to list policies for.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4802,7 +4825,7 @@
       "members":{
         "PathPrefix":{
           "shape":"pathPrefixType",
-          "documentation":"<p> The path prefix for filtering the results. For example: <code>/division_abc/subdivision_xyz/</code>, which would get all user names whose path starts with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all user names. This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path prefix for filtering the results. For example: <code>/division_abc/subdivision_xyz/</code>, which would get all user names whose path starts with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all user names. This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4838,7 +4861,7 @@
       "members":{
         "AssignmentStatus":{
           "shape":"assignmentStatusType",
-          "documentation":"<p> The status (<code>Unassigned</code> or <code>Assigned</code>) of the devices to list. If you do not specify an <code>AssignmentStatus</code>, the action defaults to <code>Any</code> which lists both assigned and unassigned virtual MFA devices.</p>"
+          "documentation":"<p> The status (<code>Unassigned</code> or <code>Assigned</code>) of the devices to list. If you do not specify an <code>AssignmentStatus</code>, the operation defaults to <code>Any</code> which lists both assigned and unassigned virtual MFA devices.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4889,7 +4912,7 @@
           "documentation":"<p>Specifies whether the user is required to set a new password on next sign-in.</p>"
         }
       },
-      "documentation":"<p>Contains the user name and password create date for a user.</p> <p> This data type is used as a response element in the <a>CreateLoginProfile</a> and <a>GetLoginProfile</a> actions. </p>"
+      "documentation":"<p>Contains the user name and password create date for a user.</p> <p> This data type is used as a response element in the <a>CreateLoginProfile</a> and <a>GetLoginProfile</a> operations. </p>"
     },
     "MFADevice":{
       "type":"structure",
@@ -4912,7 +4935,7 @@
           "documentation":"<p>The date when the MFA device was enabled for the user.</p>"
         }
       },
-      "documentation":"<p>Contains information about an MFA device.</p> <p>This data type is used as a response element in the <a>ListMFADevices</a> action.</p>"
+      "documentation":"<p>Contains information about an MFA device.</p> <p>This data type is used as a response element in the <a>ListMFADevices</a> operation.</p>"
     },
     "MalformedCertificateException":{
       "type":"structure",
@@ -4985,7 +5008,7 @@
           "documentation":"<p>A list containing information about the versions of the policy.</p>"
         }
       },
-      "documentation":"<p>Contains information about a managed policy, including the policy's ARN, versions, and the number of principal entities (users, groups, and roles) that the policy is attached to.</p> <p>This data type is used as a response element in the <a>GetAccountAuthorizationDetails</a> action.</p> <p>For more information about managed policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
+      "documentation":"<p>Contains information about a managed policy, including the policy's ARN, versions, and the number of principal entities (users, groups, and roles) that the policy is attached to.</p> <p>This data type is used as a response element in the <a>GetAccountAuthorizationDetails</a> operation.</p> <p>For more information about managed policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
     },
     "ManagedPolicyDetailListType":{
       "type":"list",
@@ -5027,10 +5050,10 @@
       "members":{
         "AllowedByOrganizations":{
           "shape":"booleanType",
-          "documentation":"<p>Specifies whether the simulated action is allowed by the AWS Organizations service control policies that impact the simulated user's account.</p>"
+          "documentation":"<p>Specifies whether the simulated operation is allowed by the AWS Organizations service control policies that impact the simulated user's account.</p>"
         }
       },
-      "documentation":"<p>Contains information about AWS Organizations's affect on a policy simulation.</p>"
+      "documentation":"<p>Contains information about AWS Organizations's effect on a policy simulation.</p>"
     },
     "PasswordPolicy":{
       "type":"structure",
@@ -5061,7 +5084,7 @@
         },
         "ExpirePasswords":{
           "shape":"booleanType",
-          "documentation":"<p>Indicates whether passwords in the account expire. Returns true if MaxPasswordAge is contains a value greater than 0. Returns false if MaxPasswordAge is 0 or not present.</p>"
+          "documentation":"<p>Indicates whether passwords in the account expire. Returns true if <code>MaxPasswordAge</code> contains a value greater than 0. Returns false if MaxPasswordAge is 0 or not present.</p>"
         },
         "MaxPasswordAge":{
           "shape":"maxPasswordAgeType",
@@ -5076,7 +5099,7 @@
           "documentation":"<p>Specifies whether IAM users are prevented from setting a new password after their password has expired.</p>"
         }
       },
-      "documentation":"<p>Contains information about the account password policy.</p> <p> This data type is used as a response element in the <a>GetAccountPasswordPolicy</a> action. </p>"
+      "documentation":"<p>Contains information about the account password policy.</p> <p> This data type is used as a response element in the <a>GetAccountPasswordPolicy</a> operation. </p>"
     },
     "PasswordPolicyViolationException":{
       "type":"structure",
@@ -5132,7 +5155,7 @@
           "documentation":"<p>The date and time, in <a href=\"http://www.iso.org/iso/iso8601\">ISO 8601 date-time format</a>, when the policy was last updated.</p> <p>When a policy has only one version, this field contains the date and time when the policy was created. When a policy has more than one version, this field contains the date and time when the most recent policy version was created.</p>"
         }
       },
-      "documentation":"<p>Contains information about a managed policy.</p> <p>This data type is used as a response element in the <a>CreatePolicy</a>, <a>GetPolicy</a>, and <a>ListPolicies</a> actions. </p> <p>For more information about managed policies, refer to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
+      "documentation":"<p>Contains information about a managed policy.</p> <p>This data type is used as a response element in the <a>CreatePolicy</a>, <a>GetPolicy</a>, and <a>ListPolicies</a> operations. </p> <p>For more information about managed policies, refer to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
     },
     "PolicyDetail":{
       "type":"structure",
@@ -5146,7 +5169,7 @@
           "documentation":"<p>The policy document.</p>"
         }
       },
-      "documentation":"<p>Contains information about an IAM policy, including the policy document.</p> <p>This data type is used as a response element in the <a>GetAccountAuthorizationDetails</a> action.</p>"
+      "documentation":"<p>Contains information about an IAM policy, including the policy document.</p> <p>This data type is used as a response element in the <a>GetAccountAuthorizationDetails</a> operation.</p>"
     },
     "PolicyEvaluationDecisionType":{
       "type":"string",
@@ -5180,7 +5203,7 @@
           "documentation":"<p>The stable and unique string identifying the group. For more information about IDs, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         }
       },
-      "documentation":"<p>Contains information about a group that a managed policy is attached to.</p> <p>This data type is used as a response element in the <a>ListEntitiesForPolicy</a> action. </p> <p>For more information about managed policies, refer to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
+      "documentation":"<p>Contains information about a group that a managed policy is attached to.</p> <p>This data type is used as a response element in the <a>ListEntitiesForPolicy</a> operation. </p> <p>For more information about managed policies, refer to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
     },
     "PolicyGroupListType":{
       "type":"list",
@@ -5212,7 +5235,7 @@
           "documentation":"<p>The stable and unique string identifying the role. For more information about IDs, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         }
       },
-      "documentation":"<p>Contains information about a role that a managed policy is attached to.</p> <p>This data type is used as a response element in the <a>ListEntitiesForPolicy</a> action. </p> <p>For more information about managed policies, refer to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
+      "documentation":"<p>Contains information about a role that a managed policy is attached to.</p> <p>This data type is used as a response element in the <a>ListEntitiesForPolicy</a> operation. </p> <p>For more information about managed policies, refer to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
     },
     "PolicyRoleListType":{
       "type":"list",
@@ -5242,7 +5265,7 @@
           "documentation":"<p>The stable and unique string identifying the user. For more information about IDs, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         }
       },
-      "documentation":"<p>Contains information about a user that a managed policy is attached to.</p> <p>This data type is used as a response element in the <a>ListEntitiesForPolicy</a> action. </p> <p>For more information about managed policies, refer to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
+      "documentation":"<p>Contains information about a user that a managed policy is attached to.</p> <p>This data type is used as a response element in the <a>ListEntitiesForPolicy</a> operation. </p> <p>For more information about managed policies, refer to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
     },
     "PolicyUserListType":{
       "type":"list",
@@ -5253,7 +5276,7 @@
       "members":{
         "Document":{
           "shape":"policyDocumentType",
-          "documentation":"<p>The policy document.</p> <p>The policy document is returned in the response to the <a>GetPolicyVersion</a> and <a>GetAccountAuthorizationDetails</a> operations. It is not returned in the response to the <a>CreatePolicyVersion</a> or <a>ListPolicyVersions</a> operations. </p>"
+          "documentation":"<p>The policy document.</p> <p>The policy document is returned in the response to the <a>GetPolicyVersion</a> and <a>GetAccountAuthorizationDetails</a> operations. It is not returned in the response to the <a>CreatePolicyVersion</a> or <a>ListPolicyVersions</a> operations. </p> <p>The policy document returned in this structure is URL-encoded compliant with <a href=\"https://tools.ietf.org/html/rfc3986\">RFC 3986</a>. You can use a URL decoding method to convert the policy back to plain JSON text. For example, if you use Java, you can use the <code>decode</code> method of the <code>java.net.URLDecoder</code> utility class in the Java SDK. Other languages and SDKs provide similar functionality.</p>"
         },
         "VersionId":{
           "shape":"policyVersionIdType",
@@ -5268,7 +5291,7 @@
           "documentation":"<p>The date and time, in <a href=\"http://www.iso.org/iso/iso8601\">ISO 8601 date-time format</a>, when the policy version was created.</p>"
         }
       },
-      "documentation":"<p>Contains information about a version of a managed policy.</p> <p>This data type is used as a response element in the <a>CreatePolicyVersion</a>, <a>GetPolicyVersion</a>, <a>ListPolicyVersions</a>, and <a>GetAccountAuthorizationDetails</a> actions. </p> <p>For more information about managed policies, refer to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
+      "documentation":"<p>Contains information about a version of a managed policy.</p> <p>This data type is used as a response element in the <a>CreatePolicyVersion</a>, <a>GetPolicyVersion</a>, <a>ListPolicyVersions</a>, and <a>GetAccountAuthorizationDetails</a> operations. </p> <p>For more information about managed policies, refer to <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
     },
     "Position":{
       "type":"structure",
@@ -5294,15 +5317,15 @@
       "members":{
         "GroupName":{
           "shape":"groupNameType",
-          "documentation":"<p>The name of the group to associate the policy with.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the group to associate the policy with.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "PolicyName":{
           "shape":"policyNameType",
-          "documentation":"<p>The name of the policy document.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-+</p>"
+          "documentation":"<p>The name of the policy document.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "PolicyDocument":{
           "shape":"policyDocumentType",
-          "documentation":"<p>The policy document.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D).</p>"
+          "documentation":"<p>The policy document.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
         }
       }
     },
@@ -5320,11 +5343,11 @@
         },
         "PolicyName":{
           "shape":"policyNameType",
-          "documentation":"<p>The name of the policy document.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-+</p>"
+          "documentation":"<p>The name of the policy document.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "PolicyDocument":{
           "shape":"policyDocumentType",
-          "documentation":"<p>The policy document.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D).</p>"
+          "documentation":"<p>The policy document.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
         }
       }
     },
@@ -5338,15 +5361,15 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the user to associate the policy with.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user to associate the policy with.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "PolicyName":{
           "shape":"policyNameType",
-          "documentation":"<p>The name of the policy document.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-+</p>"
+          "documentation":"<p>The name of the policy document.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "PolicyDocument":{
           "shape":"policyDocumentType",
-          "documentation":"<p>The policy document.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D).</p>"
+          "documentation":"<p>The policy document.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
         }
       }
     },
@@ -5368,7 +5391,7 @@
       "members":{
         "OpenIDConnectProviderArn":{
           "shape":"arnType",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM OIDC provider resource to remove the client ID from. You can get a list of OIDC provider ARNs by using the <a>ListOpenIDConnectProviders</a> action.</p> <p>For more information about ARNs, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General Reference</i>.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM OIDC provider resource to remove the client ID from. You can get a list of OIDC provider ARNs by using the <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more information about ARNs, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General Reference</i>.</p>"
         },
         "ClientID":{
           "shape":"clientIDType",
@@ -5385,7 +5408,7 @@
       "members":{
         "InstanceProfileName":{
           "shape":"instanceProfileNameType",
-          "documentation":"<p>The name of the instance profile to update.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the instance profile to update.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "RoleName":{
           "shape":"roleNameType",
@@ -5402,11 +5425,11 @@
       "members":{
         "GroupName":{
           "shape":"groupNameType",
-          "documentation":"<p>The name of the group to update.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the group to update.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the user to remove.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user to remove.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -5430,7 +5453,7 @@
       "members":{
         "UserName":{
           "shape":"userNameType",
-          "documentation":"<p>The name of the IAM user associated with the service-specific credential. If this value is not specified, then the operation assumes the user whose credentials are used to call the operation.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the IAM user associated with the service-specific credential. If this value is not specified, then the operation assumes the user whose credentials are used to call the operation.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "ServiceSpecificCredentialId":{
           "shape":"serviceSpecificCredentialId",
@@ -5474,11 +5497,11 @@
         },
         "EvalResourceDecision":{
           "shape":"PolicyEvaluationDecisionType",
-          "documentation":"<p>The result of the simulation of the simulated API action on the resource specified in <code>EvalResourceName</code>.</p>"
+          "documentation":"<p>The result of the simulation of the simulated API operation on the resource specified in <code>EvalResourceName</code>.</p>"
         },
         "MatchedStatements":{
           "shape":"StatementListType",
-          "documentation":"<p>A list of the statements in the input policies that determine the result for this part of the simulation. Remember that even if multiple statements allow the action on the resource, if <i>any</i> statement denies that action, then the explicit deny overrides any allow, and the deny statement is the only entry included in the result.</p>"
+          "documentation":"<p>A list of the statements in the input policies that determine the result for this part of the simulation. Remember that even if multiple statements allow the operation on the resource, if <i>any</i> statement denies that operation, then the explicit deny overrides any allow, and the deny statement is the only entry included in the result.</p>"
         },
         "MissingContextValues":{
           "shape":"ContextKeyNamesResultListType",
@@ -5489,7 +5512,7 @@
           "documentation":"<p>Additional details about the results of the evaluation decision. When there are both IAM policies and resource policies, this parameter explains how each set of policies contributes to the final evaluation decision. When simulating cross-account access to a resource, both the resource-based policy and the caller's IAM policy must grant access.</p>"
         }
       },
-      "documentation":"<p>Contains the result of the simulation of a single API action call on a single resource.</p> <p>This data type is used by a member of the <a>EvaluationResult</a> data type.</p>"
+      "documentation":"<p>Contains the result of the simulation of a single API operation call on a single resource.</p> <p>This data type is used by a member of the <a>EvaluationResult</a> data type.</p>"
     },
     "ResourceSpecificResultListType":{
       "type":"list",
@@ -5506,11 +5529,11 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the user whose MFA device you want to resynchronize.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user whose MFA device you want to resynchronize.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "SerialNumber":{
           "shape":"serialNumberType",
-          "documentation":"<p>Serial number that uniquely identifies the MFA device.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>Serial number that uniquely identifies the MFA device.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "AuthenticationCode1":{
           "shape":"authenticationCodeType",
@@ -5559,9 +5582,13 @@
         "Description":{
           "shape":"roleDescriptionType",
           "documentation":"<p>A description of the role that you provide.</p>"
+        },
+        "MaxSessionDuration":{
+          "shape":"roleMaxSessionDurationType",
+          "documentation":"<p>The maximum session duration (in seconds) for the specified role. Anyone who uses the AWS CLI or API to assume the role can specify the duration using the optional <code>DurationSeconds</code> API parameter or <code>duration-seconds</code> CLI parameter.</p>"
         }
       },
-      "documentation":"<p>Contains information about an IAM role. This structure is returned as a response element in several APIs that interact with roles.</p>"
+      "documentation":"<p>Contains information about an IAM role. This structure is returned as a response element in several API operations that interact with roles.</p>"
     },
     "RoleDetail":{
       "type":"structure",
@@ -5600,7 +5627,7 @@
           "documentation":"<p>A list of managed policies attached to the role. These policies are the role's access (permissions) policies.</p>"
         }
       },
-      "documentation":"<p>Contains information about an IAM role, including all of the role's policies.</p> <p>This data type is used as a response element in the <a>GetAccountAuthorizationDetails</a> action.</p>"
+      "documentation":"<p>Contains information about an IAM role, including all of the role's policies.</p> <p>This data type is used as a response element in the <a>GetAccountAuthorizationDetails</a> operation.</p>"
     },
     "RoleUsageListType":{
       "type":"list",
@@ -5618,7 +5645,7 @@
           "documentation":"<p>The name of the resource that is using the service-linked role.</p>"
         }
       },
-      "documentation":"<p>An object that contains details about how a service-linked role is used.</p> <p>This data type is used as a response element in the <a>GetServiceLinkedRoleDeletionStatus</a> operation.</p>"
+      "documentation":"<p>An object that contains details about how a service-linked role is used, if that information is returned by the service.</p> <p>This data type is used as a response element in the <a>GetServiceLinkedRoleDeletionStatus</a> operation.</p>"
     },
     "SAMLMetadataDocumentType":{
       "type":"string",
@@ -5681,14 +5708,14 @@
         },
         "Status":{
           "shape":"statusType",
-          "documentation":"<p>The status of the SSH public key. <code>Active</code> means the key can be used for authentication with an AWS CodeCommit repository. <code>Inactive</code> means the key cannot be used.</p>"
+          "documentation":"<p>The status of the SSH public key. <code>Active</code> means that the key can be used for authentication with an AWS CodeCommit repository. <code>Inactive</code> means that the key cannot be used.</p>"
         },
         "UploadDate":{
           "shape":"dateType",
           "documentation":"<p>The date and time, in <a href=\"http://www.iso.org/iso/iso8601\">ISO 8601 date-time format</a>, when the SSH public key was uploaded.</p>"
         }
       },
-      "documentation":"<p>Contains information about an SSH public key.</p> <p>This data type is used as a response element in the <a>GetSSHPublicKey</a> and <a>UploadSSHPublicKey</a> actions. </p>"
+      "documentation":"<p>Contains information about an SSH public key.</p> <p>This data type is used as a response element in the <a>GetSSHPublicKey</a> and <a>UploadSSHPublicKey</a> operations. </p>"
     },
     "SSHPublicKeyListType":{
       "type":"list",
@@ -5713,14 +5740,14 @@
         },
         "Status":{
           "shape":"statusType",
-          "documentation":"<p>The status of the SSH public key. <code>Active</code> means the key can be used for authentication with an AWS CodeCommit repository. <code>Inactive</code> means the key cannot be used.</p>"
+          "documentation":"<p>The status of the SSH public key. <code>Active</code> means that the key can be used for authentication with an AWS CodeCommit repository. <code>Inactive</code> means that the key cannot be used.</p>"
         },
         "UploadDate":{
           "shape":"dateType",
           "documentation":"<p>The date and time, in <a href=\"http://www.iso.org/iso/iso8601\">ISO 8601 date-time format</a>, when the SSH public key was uploaded.</p>"
         }
       },
-      "documentation":"<p>Contains information about an SSH public key, without the key's body or fingerprint.</p> <p>This data type is used as a response element in the <a>ListSSHPublicKeys</a> action.</p>"
+      "documentation":"<p>Contains information about an SSH public key, without the key's body or fingerprint.</p> <p>This data type is used as a response element in the <a>ListSSHPublicKeys</a> operation.</p>"
     },
     "ServerCertificate":{
       "type":"structure",
@@ -5742,7 +5769,7 @@
           "documentation":"<p>The contents of the public key certificate chain.</p>"
         }
       },
-      "documentation":"<p>Contains information about a server certificate.</p> <p> This data type is used as a response element in the <a>GetServerCertificate</a> action. </p>"
+      "documentation":"<p>Contains information about a server certificate.</p> <p> This data type is used as a response element in the <a>GetServerCertificate</a> operation. </p>"
     },
     "ServerCertificateMetadata":{
       "type":"structure",
@@ -5778,7 +5805,7 @@
           "documentation":"<p>The date on which the certificate is set to expire.</p>"
         }
       },
-      "documentation":"<p>Contains information about a server certificate without its certificate body, certificate chain, and private key.</p> <p> This data type is used as a response element in the <a>UploadServerCertificate</a> and <a>ListServerCertificates</a> actions. </p>"
+      "documentation":"<p>Contains information about a server certificate without its certificate body, certificate chain, and private key.</p> <p> This data type is used as a response element in the <a>UploadServerCertificate</a> and <a>ListServerCertificates</a> operations. </p>"
     },
     "ServiceFailureException":{
       "type":"structure",
@@ -5843,10 +5870,10 @@
         },
         "Status":{
           "shape":"statusType",
-          "documentation":"<p>The status of the service-specific credential. <code>Active</code> means the key is valid for API calls, while <code>Inactive</code> means it is not.</p>"
+          "documentation":"<p>The status of the service-specific credential. <code>Active</code> means that the key is valid for API calls, while <code>Inactive</code> means it is not.</p>"
         }
       },
-      "documentation":"<p>Contains the details of a service specific credential.</p>"
+      "documentation":"<p>Contains the details of a service-specific credential.</p>"
     },
     "ServiceSpecificCredentialMetadata":{
       "type":"structure",
@@ -5865,7 +5892,7 @@
         },
         "Status":{
           "shape":"statusType",
-          "documentation":"<p>The status of the service-specific credential. <code>Active</code> means the key is valid for API calls, while <code>Inactive</code> means it is not.</p>"
+          "documentation":"<p>The status of the service-specific credential. <code>Active</code> means that the key is valid for API calls, while <code>Inactive</code> means it is not.</p>"
         },
         "ServiceUserName":{
           "shape":"serviceUserName",
@@ -5930,14 +5957,14 @@
         },
         "Status":{
           "shape":"statusType",
-          "documentation":"<p>The status of the signing certificate. <code>Active</code> means the key is valid for API calls, while <code>Inactive</code> means it is not.</p>"
+          "documentation":"<p>The status of the signing certificate. <code>Active</code> means that the key is valid for API calls, while <code>Inactive</code> means it is not.</p>"
         },
         "UploadDate":{
           "shape":"dateType",
           "documentation":"<p>The date when the signing certificate was uploaded.</p>"
         }
       },
-      "documentation":"<p>Contains information about an X.509 signing certificate.</p> <p>This data type is used as a response element in the <a>UploadSigningCertificate</a> and <a>ListSigningCertificates</a> actions. </p>"
+      "documentation":"<p>Contains information about an X.509 signing certificate.</p> <p>This data type is used as a response element in the <a>UploadSigningCertificate</a> and <a>ListSigningCertificates</a> operations. </p>"
     },
     "SimulateCustomPolicyRequest":{
       "type":"structure",
@@ -5948,11 +5975,11 @@
       "members":{
         "PolicyInputList":{
           "shape":"SimulationPolicyListType",
-          "documentation":"<p>A list of policy documents to include in the simulation. Each document is specified as a string containing the complete, valid JSON text of an IAM policy. Do not include any resource-based policies in this parameter. Any resource-based policy must be submitted with the <code>ResourcePolicy</code> parameter. The policies cannot be \"scope-down\" policies, such as you could include in a call to <a href=\"http://docs.aws.amazon.com/IAM/latest/APIReference/API_GetFederationToken.html\">GetFederationToken</a> or one of the <a href=\"http://docs.aws.amazon.com/IAM/latest/APIReference/API_AssumeRole.html\">AssumeRole</a> APIs to restrict what a user can do while using the temporary credentials.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D).</p>"
+          "documentation":"<p>A list of policy documents to include in the simulation. Each document is specified as a string containing the complete, valid JSON text of an IAM policy. Do not include any resource-based policies in this parameter. Any resource-based policy must be submitted with the <code>ResourcePolicy</code> parameter. The policies cannot be \"scope-down\" policies, such as you could include in a call to <a href=\"http://docs.aws.amazon.com/IAM/latest/APIReference/API_GetFederationToken.html\">GetFederationToken</a> or one of the <a href=\"http://docs.aws.amazon.com/IAM/latest/APIReference/API_AssumeRole.html\">AssumeRole</a> API operations. In other words, do not use policies designed to restrict what a user can do while using the temporary credentials.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
         },
         "ActionNames":{
           "shape":"ActionNameListType",
-          "documentation":"<p>A list of names of API actions to evaluate in the simulation. Each action is evaluated against each resource. Each action must include the service identifier, such as <code>iam:CreateUser</code>.</p>"
+          "documentation":"<p>A list of names of API operations to evaluate in the simulation. Each operation is evaluated against each resource. Each operation must include the service identifier, such as <code>iam:CreateUser</code>.</p>"
         },
         "ResourceArns":{
           "shape":"ResourceNameListType",
@@ -5960,7 +5987,7 @@
         },
         "ResourcePolicy":{
           "shape":"policyDocumentType",
-          "documentation":"<p>A resource-based policy to include in the simulation provided as a string. Each resource in the simulation is treated as if it had this policy attached. You can include only one resource-based policy in a simulation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D).</p>"
+          "documentation":"<p>A resource-based policy to include in the simulation provided as a string. Each resource in the simulation is treated as if it had this policy attached. You can include only one resource-based policy in a simulation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
         },
         "ResourceOwner":{
           "shape":"ResourceNameType",
@@ -5968,7 +5995,7 @@
         },
         "CallerArn":{
           "shape":"ResourceNameType",
-          "documentation":"<p>The ARN of the IAM user that you want to use as the simulated caller of the APIs. <code>CallerArn</code> is required if you include a <code>ResourcePolicy</code> so that the policy's <code>Principal</code> element has a value to use in evaluating the policy.</p> <p>You can specify only the ARN of an IAM user. You cannot specify the ARN of an assumed role, federated user, or a service principal.</p>"
+          "documentation":"<p>The ARN of the IAM user that you want to use as the simulated caller of the API operations. <code>CallerArn</code> is required if you include a <code>ResourcePolicy</code> so that the policy's <code>Principal</code> element has a value to use in evaluating the policy.</p> <p>You can specify only the ARN of an IAM user. You cannot specify the ARN of an assumed role, federated user, or a service principal.</p>"
         },
         "ContextEntries":{
           "shape":"ContextEntryListType",
@@ -5976,7 +6003,7 @@
         },
         "ResourceHandlingOption":{
           "shape":"ResourceHandlingOptionType",
-          "documentation":"<p>Specifies the type of simulation to run. Different APIs that support resource-based policies require different combinations of resources. By specifying the type of simulation to run, you enable the policy simulator to enforce the presence of the required resources to ensure reliable simulation results. If your simulation does not match one of the following scenarios, then you can omit this parameter. The following list shows each of the supported scenario values and the resources that you must define to run the simulation.</p> <p>Each of the EC2 scenarios requires that you specify instance, image, and security-group resources. If your scenario includes an EBS volume, then you must specify that volume as a resource. If the EC2 scenario includes VPC, then you must supply the network-interface resource. If it includes an IP subnet, then you must specify the subnet resource. For more information on the EC2 scenario options, see <a href=\"http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html\">Supported Platforms</a> in the <i>AWS EC2 User Guide</i>.</p> <ul> <li> <p> <b>EC2-Classic-InstanceStore</b> </p> <p>instance, image, security-group</p> </li> <li> <p> <b>EC2-Classic-EBS</b> </p> <p>instance, image, security-group, volume</p> </li> <li> <p> <b>EC2-VPC-InstanceStore</b> </p> <p>instance, image, security-group, network-interface</p> </li> <li> <p> <b>EC2-VPC-InstanceStore-Subnet</b> </p> <p>instance, image, security-group, network-interface, subnet</p> </li> <li> <p> <b>EC2-VPC-EBS</b> </p> <p>instance, image, security-group, network-interface, volume</p> </li> <li> <p> <b>EC2-VPC-EBS-Subnet</b> </p> <p>instance, image, security-group, network-interface, subnet, volume</p> </li> </ul>"
+          "documentation":"<p>Specifies the type of simulation to run. Different API operations that support resource-based policies require different combinations of resources. By specifying the type of simulation to run, you enable the policy simulator to enforce the presence of the required resources to ensure reliable simulation results. If your simulation does not match one of the following scenarios, then you can omit this parameter. The following list shows each of the supported scenario values and the resources that you must define to run the simulation.</p> <p>Each of the EC2 scenarios requires that you specify instance, image, and security-group resources. If your scenario includes an EBS volume, then you must specify that volume as a resource. If the EC2 scenario includes VPC, then you must supply the network-interface resource. If it includes an IP subnet, then you must specify the subnet resource. For more information on the EC2 scenario options, see <a href=\"http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html\">Supported Platforms</a> in the <i>Amazon EC2 User Guide</i>.</p> <ul> <li> <p> <b>EC2-Classic-InstanceStore</b> </p> <p>instance, image, security-group</p> </li> <li> <p> <b>EC2-Classic-EBS</b> </p> <p>instance, image, security-group, volume</p> </li> <li> <p> <b>EC2-VPC-InstanceStore</b> </p> <p>instance, image, security-group, network-interface</p> </li> <li> <p> <b>EC2-VPC-InstanceStore-Subnet</b> </p> <p>instance, image, security-group, network-interface, subnet</p> </li> <li> <p> <b>EC2-VPC-EBS</b> </p> <p>instance, image, security-group, network-interface, volume</p> </li> <li> <p> <b>EC2-VPC-EBS-Subnet</b> </p> <p>instance, image, security-group, network-interface, subnet, volume</p> </li> </ul>"
         },
         "MaxItems":{
           "shape":"maxItemsType",
@@ -6019,19 +6046,19 @@
         },
         "PolicyInputList":{
           "shape":"SimulationPolicyListType",
-          "documentation":"<p>An optional list of additional policy documents to include in the simulation. Each document is specified as a string containing the complete, valid JSON text of an IAM policy.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D).</p>"
+          "documentation":"<p>An optional list of additional policy documents to include in the simulation. Each document is specified as a string containing the complete, valid JSON text of an IAM policy.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
         },
         "ActionNames":{
           "shape":"ActionNameListType",
-          "documentation":"<p>A list of names of API actions to evaluate in the simulation. Each action is evaluated for each resource. Each action must include the service identifier, such as <code>iam:CreateUser</code>.</p>"
+          "documentation":"<p>A list of names of API operations to evaluate in the simulation. Each operation is evaluated for each resource. Each operation must include the service identifier, such as <code>iam:CreateUser</code>.</p>"
         },
         "ResourceArns":{
           "shape":"ResourceNameListType",
-          "documentation":"<p>A list of ARNs of AWS resources to include in the simulation. If this parameter is not provided then the value defaults to <code>*</code> (all resources). Each API in the <code>ActionNames</code> parameter is evaluated for each resource in this list. The simulation determines the access result (allowed or denied) of each combination and reports it in the response.</p> <p>The simulation does not automatically retrieve policies for the specified resources. If you want to include a resource policy in the simulation, then you must include the policy as a string in the <code>ResourcePolicy</code> parameter.</p> <p>For more information about ARNs, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General Reference</i>.</p>"
+          "documentation":"<p>A list of ARNs of AWS resources to include in the simulation. If this parameter is not provided, then the value defaults to <code>*</code> (all resources). Each API in the <code>ActionNames</code> parameter is evaluated for each resource in this list. The simulation determines the access result (allowed or denied) of each combination and reports it in the response.</p> <p>The simulation does not automatically retrieve policies for the specified resources. If you want to include a resource policy in the simulation, then you must include the policy as a string in the <code>ResourcePolicy</code> parameter.</p> <p>For more information about ARNs, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General Reference</i>.</p>"
         },
         "ResourcePolicy":{
           "shape":"policyDocumentType",
-          "documentation":"<p>A resource-based policy to include in the simulation provided as a string. Each resource in the simulation is treated as if it had this policy attached. You can include only one resource-based policy in a simulation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D).</p>"
+          "documentation":"<p>A resource-based policy to include in the simulation provided as a string. Each resource in the simulation is treated as if it had this policy attached. You can include only one resource-based policy in a simulation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
         },
         "ResourceOwner":{
           "shape":"ResourceNameType",
@@ -6039,7 +6066,7 @@
         },
         "CallerArn":{
           "shape":"ResourceNameType",
-          "documentation":"<p>The ARN of the IAM user that you want to specify as the simulated caller of the APIs. If you do not specify a <code>CallerArn</code>, it defaults to the ARN of the user that you specify in <code>PolicySourceArn</code>, if you specified a user. If you include both a <code>PolicySourceArn</code> (for example, <code>arn:aws:iam::123456789012:user/David</code>) and a <code>CallerArn</code> (for example, <code>arn:aws:iam::123456789012:user/Bob</code>), the result is that you simulate calling the APIs as Bob, as if Bob had David's policies.</p> <p>You can specify only the ARN of an IAM user. You cannot specify the ARN of an assumed role, federated user, or a service principal.</p> <p> <code>CallerArn</code> is required if you include a <code>ResourcePolicy</code> and the <code>PolicySourceArn</code> is not the ARN for an IAM user. This is required so that the resource-based policy's <code>Principal</code> element has a value to use in evaluating the policy.</p> <p>For more information about ARNs, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General Reference</i>.</p>"
+          "documentation":"<p>The ARN of the IAM user that you want to specify as the simulated caller of the API operations. If you do not specify a <code>CallerArn</code>, it defaults to the ARN of the user that you specify in <code>PolicySourceArn</code>, if you specified a user. If you include both a <code>PolicySourceArn</code> (for example, <code>arn:aws:iam::123456789012:user/David</code>) and a <code>CallerArn</code> (for example, <code>arn:aws:iam::123456789012:user/Bob</code>), the result is that you simulate calling the API operations as Bob, as if Bob had David's policies.</p> <p>You can specify only the ARN of an IAM user. You cannot specify the ARN of an assumed role, federated user, or a service principal.</p> <p> <code>CallerArn</code> is required if you include a <code>ResourcePolicy</code> and the <code>PolicySourceArn</code> is not the ARN for an IAM user. This is required so that the resource-based policy's <code>Principal</code> element has a value to use in evaluating the policy.</p> <p>For more information about ARNs, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General Reference</i>.</p>"
         },
         "ContextEntries":{
           "shape":"ContextEntryListType",
@@ -6047,7 +6074,7 @@
         },
         "ResourceHandlingOption":{
           "shape":"ResourceHandlingOptionType",
-          "documentation":"<p>Specifies the type of simulation to run. Different APIs that support resource-based policies require different combinations of resources. By specifying the type of simulation to run, you enable the policy simulator to enforce the presence of the required resources to ensure reliable simulation results. If your simulation does not match one of the following scenarios, then you can omit this parameter. The following list shows each of the supported scenario values and the resources that you must define to run the simulation.</p> <p>Each of the EC2 scenarios requires that you specify instance, image, and security-group resources. If your scenario includes an EBS volume, then you must specify that volume as a resource. If the EC2 scenario includes VPC, then you must supply the network-interface resource. If it includes an IP subnet, then you must specify the subnet resource. For more information on the EC2 scenario options, see <a href=\"http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html\">Supported Platforms</a> in the <i>AWS EC2 User Guide</i>.</p> <ul> <li> <p> <b>EC2-Classic-InstanceStore</b> </p> <p>instance, image, security-group</p> </li> <li> <p> <b>EC2-Classic-EBS</b> </p> <p>instance, image, security-group, volume</p> </li> <li> <p> <b>EC2-VPC-InstanceStore</b> </p> <p>instance, image, security-group, network-interface</p> </li> <li> <p> <b>EC2-VPC-InstanceStore-Subnet</b> </p> <p>instance, image, security-group, network-interface, subnet</p> </li> <li> <p> <b>EC2-VPC-EBS</b> </p> <p>instance, image, security-group, network-interface, volume</p> </li> <li> <p> <b>EC2-VPC-EBS-Subnet</b> </p> <p>instance, image, security-group, network-interface, subnet, volume</p> </li> </ul>"
+          "documentation":"<p>Specifies the type of simulation to run. Different API operations that support resource-based policies require different combinations of resources. By specifying the type of simulation to run, you enable the policy simulator to enforce the presence of the required resources to ensure reliable simulation results. If your simulation does not match one of the following scenarios, then you can omit this parameter. The following list shows each of the supported scenario values and the resources that you must define to run the simulation.</p> <p>Each of the EC2 scenarios requires that you specify instance, image, and security-group resources. If your scenario includes an EBS volume, then you must specify that volume as a resource. If the EC2 scenario includes VPC, then you must supply the network-interface resource. If it includes an IP subnet, then you must specify the subnet resource. For more information on the EC2 scenario options, see <a href=\"http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html\">Supported Platforms</a> in the <i>Amazon EC2 User Guide</i>.</p> <ul> <li> <p> <b>EC2-Classic-InstanceStore</b> </p> <p>instance, image, security-group</p> </li> <li> <p> <b>EC2-Classic-EBS</b> </p> <p>instance, image, security-group, volume</p> </li> <li> <p> <b>EC2-VPC-InstanceStore</b> </p> <p>instance, image, security-group, network-interface</p> </li> <li> <p> <b>EC2-VPC-InstanceStore-Subnet</b> </p> <p>instance, image, security-group, network-interface, subnet</p> </li> <li> <p> <b>EC2-VPC-EBS</b> </p> <p>instance, image, security-group, network-interface, volume</p> </li> <li> <p> <b>EC2-VPC-EBS-Subnet</b> </p> <p>instance, image, security-group, network-interface, subnet, volume</p> </li> </ul>"
         },
         "MaxItems":{
           "shape":"maxItemsType",
@@ -6124,7 +6151,7 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the user whose key you want to update.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user whose key you want to update.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "AccessKeyId":{
           "shape":"accessKeyIdType",
@@ -6132,7 +6159,7 @@
         },
         "Status":{
           "shape":"statusType",
-          "documentation":"<p> The status you want to assign to the secret access key. <code>Active</code> means the key can be used for API calls to AWS, while <code>Inactive</code> means the key cannot be used.</p>"
+          "documentation":"<p> The status you want to assign to the secret access key. <code>Active</code> means that the key can be used for API calls to AWS, while <code>Inactive</code> means that the key cannot be used.</p>"
         }
       }
     },
@@ -6141,39 +6168,39 @@
       "members":{
         "MinimumPasswordLength":{
           "shape":"minimumPasswordLengthType",
-          "documentation":"<p>The minimum number of characters allowed in an IAM user password.</p> <p>Default value: 6</p>"
+          "documentation":"<p>The minimum number of characters allowed in an IAM user password.</p> <p>If you do not specify a value for this parameter, then the operation uses the default value of <code>6</code>.</p>"
         },
         "RequireSymbols":{
           "shape":"booleanType",
-          "documentation":"<p>Specifies whether IAM user passwords must contain at least one of the following non-alphanumeric characters:</p> <p>! @ # $ % ^ &amp;amp; * ( ) _ + - = [ ] { } | '</p> <p>Default value: false</p>"
+          "documentation":"<p>Specifies whether IAM user passwords must contain at least one of the following non-alphanumeric characters:</p> <p>! @ # $ % ^ &amp;amp; * ( ) _ + - = [ ] { } | '</p> <p>If you do not specify a value for this parameter, then the operation uses the default value of <code>false</code>. The result is that passwords do not require at least one symbol character.</p>"
         },
         "RequireNumbers":{
           "shape":"booleanType",
-          "documentation":"<p>Specifies whether IAM user passwords must contain at least one numeric character (0 to 9).</p> <p>Default value: false</p>"
+          "documentation":"<p>Specifies whether IAM user passwords must contain at least one numeric character (0 to 9).</p> <p>If you do not specify a value for this parameter, then the operation uses the default value of <code>false</code>. The result is that passwords do not require at least one numeric character.</p>"
         },
         "RequireUppercaseCharacters":{
           "shape":"booleanType",
-          "documentation":"<p>Specifies whether IAM user passwords must contain at least one uppercase character from the ISO basic Latin alphabet (A to Z).</p> <p>Default value: false</p>"
+          "documentation":"<p>Specifies whether IAM user passwords must contain at least one uppercase character from the ISO basic Latin alphabet (A to Z).</p> <p>If you do not specify a value for this parameter, then the operation uses the default value of <code>false</code>. The result is that passwords do not require at least one uppercase character.</p>"
         },
         "RequireLowercaseCharacters":{
           "shape":"booleanType",
-          "documentation":"<p>Specifies whether IAM user passwords must contain at least one lowercase character from the ISO basic Latin alphabet (a to z).</p> <p>Default value: false</p>"
+          "documentation":"<p>Specifies whether IAM user passwords must contain at least one lowercase character from the ISO basic Latin alphabet (a to z).</p> <p>If you do not specify a value for this parameter, then the operation uses the default value of <code>false</code>. The result is that passwords do not require at least one lowercase character.</p>"
         },
         "AllowUsersToChangePassword":{
           "shape":"booleanType",
-          "documentation":"<p> Allows all IAM users in your account to use the AWS Management Console to change their own passwords. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/HowToPwdIAMUser.html\">Letting IAM Users Change Their Own Passwords</a> in the <i>IAM User Guide</i>.</p> <p>Default value: false</p>"
+          "documentation":"<p> Allows all IAM users in your account to use the AWS Management Console to change their own passwords. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/HowToPwdIAMUser.html\">Letting IAM Users Change Their Own Passwords</a> in the <i>IAM User Guide</i>.</p> <p>If you do not specify a value for this parameter, then the operation uses the default value of <code>false</code>. The result is that IAM users in the account do not automatically have permissions to change their own password.</p>"
         },
         "MaxPasswordAge":{
           "shape":"maxPasswordAgeType",
-          "documentation":"<p>The number of days that an IAM user password is valid. The default value of 0 means IAM user passwords never expire.</p> <p>Default value: 0</p>"
+          "documentation":"<p>The number of days that an IAM user password is valid.</p> <p>If you do not specify a value for this parameter, then the operation uses the default value of <code>0</code>. The result is that IAM user passwords never expire.</p>"
         },
         "PasswordReusePrevention":{
           "shape":"passwordReusePreventionType",
-          "documentation":"<p>Specifies the number of previous passwords that IAM users are prevented from reusing. The default value of 0 means IAM users are not prevented from reusing previous passwords.</p> <p>Default value: 0</p>"
+          "documentation":"<p>Specifies the number of previous passwords that IAM users are prevented from reusing.</p> <p>If you do not specify a value for this parameter, then the operation uses the default value of <code>0</code>. The result is that IAM users are not prevented from reusing previous passwords.</p>"
         },
         "HardExpiry":{
           "shape":"booleanObjectType",
-          "documentation":"<p>Prevents IAM users from setting a new password after their password has expired.</p> <p>Default value: false</p>"
+          "documentation":"<p>Prevents IAM users from setting a new password after their password has expired. The IAM user cannot be accessed until an administrator resets the password.</p> <p>If you do not specify a value for this parameter, then the operation uses the default value of <code>false</code>. The result is that IAM users can change their passwords after they expire and continue to sign in as the user.</p>"
         }
       }
     },
@@ -6190,7 +6217,7 @@
         },
         "PolicyDocument":{
           "shape":"policyDocumentType",
-          "documentation":"<p>The policy that grants an entity permission to assume the role.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D).</p>"
+          "documentation":"<p>The policy that grants an entity permission to assume the role.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
         }
       }
     },
@@ -6200,15 +6227,15 @@
       "members":{
         "GroupName":{
           "shape":"groupNameType",
-          "documentation":"<p>Name of the IAM group to update. If you're changing the name of the group, this is the original name.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>Name of the IAM group to update. If you're changing the name of the group, this is the original name.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "NewPath":{
           "shape":"pathType",
-          "documentation":"<p>New path for the IAM group. Only include this if changing the group's path.</p> <p>This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p>New path for the IAM group. Only include this if changing the group's path.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "NewGroupName":{
           "shape":"groupNameType",
-          "documentation":"<p>New name for the IAM group. Only include this if changing the group's name.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>New name for the IAM group. Only include this if changing the group's name.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -6218,11 +6245,11 @@
       "members":{
         "UserName":{
           "shape":"userNameType",
-          "documentation":"<p>The name of the user whose password you want to update.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user whose password you want to update.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "Password":{
           "shape":"passwordType",
-          "documentation":"<p>The new password for the specified IAM user.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D). However, the format can be further restricted by the account administrator by setting a password policy on the AWS account. For more information, see <a>UpdateAccountPasswordPolicy</a>.</p>"
+          "documentation":"<p>The new password for the specified IAM user.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul> <p>However, the format can be further restricted by the account administrator by setting a password policy on the AWS account. For more information, see <a>UpdateAccountPasswordPolicy</a>.</p>"
         },
         "PasswordResetRequired":{
           "shape":"booleanObjectType",
@@ -6239,7 +6266,7 @@
       "members":{
         "OpenIDConnectProviderArn":{
           "shape":"arnType",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM OIDC provider resource object for which you want to update the thumbprint. You can get a list of OIDC provider ARNs by using the <a>ListOpenIDConnectProviders</a> action.</p> <p>For more information about ARNs, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General Reference</i>.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM OIDC provider resource object for which you want to update the thumbprint. You can get a list of OIDC provider ARNs by using the <a>ListOpenIDConnectProviders</a> operation.</p> <p>For more information about ARNs, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General Reference</i>.</p>"
         },
         "ThumbprintList":{
           "shape":"thumbprintListType",
@@ -6273,6 +6300,29 @@
         }
       }
     },
+    "UpdateRoleRequest":{
+      "type":"structure",
+      "required":["RoleName"],
+      "members":{
+        "RoleName":{
+          "shape":"roleNameType",
+          "documentation":"<p>The name of the role that you want to modify.</p>"
+        },
+        "Description":{
+          "shape":"roleDescriptionType",
+          "documentation":"<p>The new description that you want to apply to the specified role.</p>"
+        },
+        "MaxSessionDuration":{
+          "shape":"roleMaxSessionDurationType",
+          "documentation":"<p>The maximum session duration (in seconds) that you want to set for the specified role. If you do not specify a value for this setting, the default maximum of one hour is applied. This setting can have a value from 1 hour to 12 hours.</p> <p>Anyone who assumes the role from the AWS CLI or API can use the <code>DurationSeconds</code> API parameter or the <code>duration-seconds</code> CLI parameter to request a longer session. The <code>MaxSessionDuration</code> setting determines the maximum duration that can be requested using the <code>DurationSeconds</code> parameter. If users don't specify a value for the <code>DurationSeconds</code> parameter, their security credentials are valid for one hour by default. This applies when you use the <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI operations but does not apply when you use those operations to create a console URL. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html\">Using IAM Roles</a> in the <i>IAM User Guide</i>.</p>"
+        }
+      }
+    },
+    "UpdateRoleResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "UpdateSAMLProviderRequest":{
       "type":"structure",
       "required":[
@@ -6310,7 +6360,7 @@
       "members":{
         "UserName":{
           "shape":"userNameType",
-          "documentation":"<p>The name of the IAM user associated with the SSH public key.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the IAM user associated with the SSH public key.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "SSHPublicKeyId":{
           "shape":"publicKeyIdType",
@@ -6318,7 +6368,7 @@
         },
         "Status":{
           "shape":"statusType",
-          "documentation":"<p>The status to assign to the SSH public key. <code>Active</code> means the key can be used for authentication with an AWS CodeCommit repository. <code>Inactive</code> means the key cannot be used.</p>"
+          "documentation":"<p>The status to assign to the SSH public key. <code>Active</code> means that the key can be used for authentication with an AWS CodeCommit repository. <code>Inactive</code> means that the key cannot be used.</p>"
         }
       }
     },
@@ -6328,15 +6378,15 @@
       "members":{
         "ServerCertificateName":{
           "shape":"serverCertificateNameType",
-          "documentation":"<p>The name of the server certificate that you want to update.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the server certificate that you want to update.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "NewPath":{
           "shape":"pathType",
-          "documentation":"<p>The new path for the server certificate. Include this only if you are updating the server certificate's path.</p> <p>This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p>The new path for the server certificate. Include this only if you are updating the server certificate's path.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "NewServerCertificateName":{
           "shape":"serverCertificateNameType",
-          "documentation":"<p>The new name for the server certificate. Include this only if you are updating the server certificate's name. The name of the certificate cannot contain any spaces.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The new name for the server certificate. Include this only if you are updating the server certificate's name. The name of the certificate cannot contain any spaces.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -6349,7 +6399,7 @@
       "members":{
         "UserName":{
           "shape":"userNameType",
-          "documentation":"<p>The name of the IAM user associated with the service-specific credential. If you do not specify this value, then the operation assumes the user whose credentials are used to call the operation.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the IAM user associated with the service-specific credential. If you do not specify this value, then the operation assumes the user whose credentials are used to call the operation.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "ServiceSpecificCredentialId":{
           "shape":"serviceSpecificCredentialId",
@@ -6370,7 +6420,7 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the IAM user the signing certificate belongs to.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the IAM user the signing certificate belongs to.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "CertificateId":{
           "shape":"certificateIdType",
@@ -6378,7 +6428,7 @@
         },
         "Status":{
           "shape":"statusType",
-          "documentation":"<p> The status you want to assign to the certificate. <code>Active</code> means the certificate can be used for API calls to AWS, while <code>Inactive</code> means the certificate cannot be used.</p>"
+          "documentation":"<p> The status you want to assign to the certificate. <code>Active</code> means that the certificate can be used for API calls to AWS <code>Inactive</code> means that the certificate cannot be used.</p>"
         }
       }
     },
@@ -6388,15 +6438,15 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>Name of the user to update. If you're changing the name of the user, this is the original user name.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>Name of the user to update. If you're changing the name of the user, this is the original user name.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "NewPath":{
           "shape":"pathType",
-          "documentation":"<p>New path for the IAM user. Include this parameter only if you're changing the user's path.</p> <p>This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p>New path for the IAM user. Include this parameter only if you're changing the user's path.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "NewUserName":{
           "shape":"userNameType",
-          "documentation":"<p>New name for the user. Include this parameter only if you're changing the user's name.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>New name for the user. Include this parameter only if you're changing the user's name.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         }
       }
     },
@@ -6409,11 +6459,11 @@
       "members":{
         "UserName":{
           "shape":"userNameType",
-          "documentation":"<p>The name of the IAM user to associate the SSH public key with.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the IAM user to associate the SSH public key with.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "SSHPublicKeyBody":{
           "shape":"publicKeyMaterialType",
-          "documentation":"<p>The SSH public key. The public key must be encoded in ssh-rsa format or PEM format.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D).</p>"
+          "documentation":"<p>The SSH public key. The public key must be encoded in ssh-rsa format or PEM format.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
         }
       }
     },
@@ -6437,23 +6487,23 @@
       "members":{
         "Path":{
           "shape":"pathType",
-          "documentation":"<p>The path for the server certificate. For more information about paths, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/). This paramater allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes, containing any ASCII character from the ! (\\u0021) thru the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p> <note> <p> If you are uploading a server certificate specifically for use with Amazon CloudFront distributions, you must specify a path using the <code>--path</code> option. The path must begin with <code>/cloudfront</code> and must include a trailing slash (for example, <code>/cloudfront/test/</code>).</p> </note>"
+          "documentation":"<p>The path for the server certificate. For more information about paths, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/). This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p> <note> <p> If you are uploading a server certificate specifically for use with Amazon CloudFront distributions, you must specify a path using the <code>path</code> parameter. The path must begin with <code>/cloudfront</code> and must include a trailing slash (for example, <code>/cloudfront/test/</code>).</p> </note>"
         },
         "ServerCertificateName":{
           "shape":"serverCertificateNameType",
-          "documentation":"<p>The name for the server certificate. Do not include the path in this value. The name of the certificate cannot contain any spaces.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name for the server certificate. Do not include the path in this value. The name of the certificate cannot contain any spaces.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "CertificateBody":{
           "shape":"certificateBodyType",
-          "documentation":"<p>The contents of the public key certificate in PEM-encoded format.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D).</p>"
+          "documentation":"<p>The contents of the public key certificate in PEM-encoded format.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
         },
         "PrivateKey":{
           "shape":"privateKeyType",
-          "documentation":"<p>The contents of the private key in PEM-encoded format.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D).</p>"
+          "documentation":"<p>The contents of the private key in PEM-encoded format.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
         },
         "CertificateChain":{
           "shape":"certificateChainType",
-          "documentation":"<p>The contents of the certificate chain. This is typically a concatenation of the PEM-encoded public key certificates of the chain.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D).</p>"
+          "documentation":"<p>The contents of the certificate chain. This is typically a concatenation of the PEM-encoded public key certificates of the chain.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
         }
       }
     },
@@ -6473,11 +6523,11 @@
       "members":{
         "UserName":{
           "shape":"existingUserNameType",
-          "documentation":"<p>The name of the user the signing certificate is for.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: =,.@-</p>"
+          "documentation":"<p>The name of the user the signing certificate is for.</p> <p>This parameter allows (per its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-</p>"
         },
         "CertificateBody":{
           "shape":"certificateBodyType",
-          "documentation":"<p>The contents of the signing certificate.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of any printable ASCII character ranging from the space character (\\u0020) through end of the ASCII character range as well as the printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF). It also includes the special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D).</p>"
+          "documentation":"<p>The contents of the signing certificate.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
         }
       }
     },
@@ -6524,10 +6574,10 @@
         },
         "PasswordLastUsed":{
           "shape":"dateType",
-          "documentation":"<p>The date and time, in <a href=\"http://www.iso.org/iso/iso8601\">ISO 8601 date-time format</a>, when the user's password was last used to sign in to an AWS website. For a list of AWS websites that capture a user's last sign-in time, see the <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/credential-reports.html\">Credential Reports</a> topic in the <i>Using IAM</i> guide. If a password is used more than once in a five-minute span, only the first use is returned in this field. If the field is null (no value) then it indicates that they never signed in with a password. This can be because:</p> <ul> <li> <p>The user never had a password.</p> </li> <li> <p>A password exists but has not been used since IAM started tracking this information on October 20th, 2014.</p> </li> </ul> <p>A null does not mean that the user <i>never</i> had a password. Also, if the user does not currently have a password, but had one in the past, then this field contains the date and time the most recent password was used.</p> <p>This value is returned only in the <a>GetUser</a> and <a>ListUsers</a> actions. </p>"
+          "documentation":"<p>The date and time, in <a href=\"http://www.iso.org/iso/iso8601\">ISO 8601 date-time format</a>, when the user's password was last used to sign in to an AWS website. For a list of AWS websites that capture a user's last sign-in time, see the <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/credential-reports.html\">Credential Reports</a> topic in the <i>Using IAM</i> guide. If a password is used more than once in a five-minute span, only the first use is returned in this field. If the field is null (no value) then it indicates that they never signed in with a password. This can be because:</p> <ul> <li> <p>The user never had a password.</p> </li> <li> <p>A password exists but has not been used since IAM started tracking this information on October 20th, 2014.</p> </li> </ul> <p>A null does not mean that the user <i>never</i> had a password. Also, if the user does not currently have a password, but had one in the past, then this field contains the date and time the most recent password was used.</p> <p>This value is returned only in the <a>GetUser</a> and <a>ListUsers</a> operations. </p>"
         }
       },
-      "documentation":"<p>Contains information about an IAM user entity.</p> <p>This data type is used as a response element in the following actions:</p> <ul> <li> <p> <a>CreateUser</a> </p> </li> <li> <p> <a>GetUser</a> </p> </li> <li> <p> <a>ListUsers</a> </p> </li> </ul>"
+      "documentation":"<p>Contains information about an IAM user entity.</p> <p>This data type is used as a response element in the following operations:</p> <ul> <li> <p> <a>CreateUser</a> </p> </li> <li> <p> <a>GetUser</a> </p> </li> <li> <p> <a>ListUsers</a> </p> </li> </ul>"
     },
     "UserDetail":{
       "type":"structure",
@@ -6562,7 +6612,7 @@
           "documentation":"<p>A list of the managed policies attached to the user.</p>"
         }
       },
-      "documentation":"<p>Contains information about an IAM user, including all the user's policies and all the IAM groups the user is in.</p> <p>This data type is used as a response element in the <a>GetAccountAuthorizationDetails</a> action.</p>"
+      "documentation":"<p>Contains information about an IAM user, including all the user's policies and all the IAM groups the user is in.</p> <p>This data type is used as a response element in the <a>GetAccountAuthorizationDetails</a> operation.</p>"
     },
     "VirtualMFADevice":{
       "type":"structure",
@@ -6600,7 +6650,7 @@
     "accessKeyMetadataListType":{
       "type":"list",
       "member":{"shape":"AccessKeyMetadata"},
-      "documentation":"<p>Contains a list of access key metadata.</p> <p>This data type is used as a response element in the <a>ListAccessKeys</a> action.</p>"
+      "documentation":"<p>Contains a list of access key metadata.</p> <p>This data type is used as a response element in the <a>ListAccessKeys</a> operation.</p>"
     },
     "accessKeySecretType":{
       "type":"string",
@@ -6667,7 +6717,7 @@
     "certificateListType":{
       "type":"list",
       "member":{"shape":"SigningCertificate"},
-      "documentation":"<p>Contains a list of signing certificates.</p> <p>This data type is used as a response element in the <a>ListSigningCertificates</a> action.</p>"
+      "documentation":"<p>Contains a list of signing certificates.</p> <p>This data type is used as a response element in the <a>ListSigningCertificates</a> operation.</p>"
     },
     "clientIDListType":{
       "type":"list",
@@ -6717,7 +6767,7 @@
     "groupListType":{
       "type":"list",
       "member":{"shape":"Group"},
-      "documentation":"<p>Contains a list of IAM groups.</p> <p>This data type is used as a response element in the <a>ListGroups</a> action.</p>"
+      "documentation":"<p>Contains a list of IAM groups.</p> <p>This data type is used as a response element in the <a>ListGroups</a> operation.</p>"
     },
     "groupNameListType":{
       "type":"list",
@@ -6775,7 +6825,7 @@
     "mfaDeviceListType":{
       "type":"list",
       "member":{"shape":"MFADevice"},
-      "documentation":"<p>Contains a list of MFA devices.</p> <p>This data type is used as a response element in the <a>ListMFADevices</a> and <a>ListVirtualMFADevices</a> actions. </p>"
+      "documentation":"<p>Contains a list of MFA devices.</p> <p>This data type is used as a response element in the <a>ListMFADevices</a> and <a>ListVirtualMFADevices</a> operations. </p>"
     },
     "minimumPasswordLengthType":{
       "type":"integer",
@@ -6835,7 +6885,7 @@
     "policyNameListType":{
       "type":"list",
       "member":{"shape":"policyNameType"},
-      "documentation":"<p>Contains a list of policy names.</p> <p>This data type is used as a response element in the <a>ListPolicies</a> action.</p>"
+      "documentation":"<p>Contains a list of policy names.</p> <p>This data type is used as a response element in the <a>ListPolicies</a> operation.</p>"
     },
     "policyNameType":{
       "type":"string",
@@ -6897,7 +6947,12 @@
     "roleListType":{
       "type":"list",
       "member":{"shape":"Role"},
-      "documentation":"<p>Contains a list of IAM roles.</p> <p>This data type is used as a response element in the <a>ListRoles</a> action.</p>"
+      "documentation":"<p>Contains a list of IAM roles.</p> <p>This data type is used as a response element in the <a>ListRoles</a> operation.</p>"
+    },
+    "roleMaxSessionDurationType":{
+      "type":"integer",
+      "max":43200,
+      "min":3600
     },
     "roleNameType":{
       "type":"string",
@@ -7004,7 +7059,7 @@
     "userListType":{
       "type":"list",
       "member":{"shape":"User"},
-      "documentation":"<p>Contains a list of users.</p> <p>This data type is used as a response element in the <a>GetGroup</a> and <a>ListUsers</a> actions. </p>"
+      "documentation":"<p>Contains a list of users.</p> <p>This data type is used as a response element in the <a>GetGroup</a> and <a>ListUsers</a> operations. </p>"
     },
     "userNameType":{
       "type":"string",
diff --git a/code-generation/api-descriptions/mturk-requester-2017-01-17.normal.json b/code-generation/api-descriptions/mturk-requester-2017-01-17.normal.json
index 3b9a089ae49..77db25a9323 100644
--- a/code-generation/api-descriptions/mturk-requester-2017-01-17.normal.json
+++ b/code-generation/api-descriptions/mturk-requester-2017-01-17.normal.json
@@ -7,6 +7,7 @@
     "protocol":"json",
     "serviceAbbreviation":"Amazon MTurk",
     "serviceFullName":"Amazon Mechanical Turk",
+    "serviceId":"MTurk",
     "signatureVersion":"v4",
     "targetPrefix":"MTurkRequesterServiceV20170117",
     "uid":"mturk-requester-2017-01-17"
@@ -376,7 +377,7 @@
         {"shape":"ServiceFault"},
         {"shape":"RequestError"}
       ],
-      "documentation":"<p> The <code>ListQualificationRequests</code> operation retrieves requests for Qualifications of a particular Qualification type. The owner of the Qualification type calls this operation to poll for pending requests, and accepts them using the AcceptQualification operation. </p>",
+      "documentation":"<p> The <code>ListQualificationTypes</code> operation returns a list of Qualification types, filtered by an optional search term. </p>",
       "idempotent":true
     },
     "ListReviewPolicyResultsForHIT":{
@@ -854,7 +855,7 @@
         },
         "QualificationRequirements":{
           "shape":"QualificationRequirementList",
-          "documentation":"<p> A condition that a Worker's Qualifications must meet before the Worker is allowed to accept and complete the HIT. </p>"
+          "documentation":"<p> Conditions that a Worker's Qualifications must meet in order to accept the HIT. A HIT can have between zero and ten Qualification requirements. All requirements must be met in order for a Worker to accept the HIT. Additionally, other actions can be restricted using the <code>ActionsGuarded</code> field on each <code>QualificationRequirement</code> structure. </p>"
         },
         "UniqueRequestToken":{
           "shape":"IdempotencyToken",
@@ -922,7 +923,7 @@
         },
         "QualificationRequirements":{
           "shape":"QualificationRequirementList",
-          "documentation":"<p> A condition that a Worker's Qualifications must meet before the Worker is allowed to accept and complete the HIT. </p>"
+          "documentation":"<p> Conditions that a Worker's Qualifications must meet in order to accept the HIT. A HIT can have between zero and ten Qualification requirements. All requirements must be met in order for a Worker to accept the HIT. Additionally, other actions can be restricted using the <code>ActionsGuarded</code> field on each <code>QualificationRequirement</code> structure. </p>"
         }
       }
     },
@@ -1383,7 +1384,7 @@
         },
         "QualificationRequirements":{
           "shape":"QualificationRequirementList",
-          "documentation":"<p> A condition that a Worker's Qualifications must meet in order to accept the HIT. A HIT can have between zero and ten Qualification requirements. All requirements must be met by a Worker's Qualifications for the Worker to accept the HIT.</p>"
+          "documentation":"<p> Conditions that a Worker's Qualifications must meet in order to accept the HIT. A HIT can have between zero and ten Qualification requirements. All requirements must be met in order for a Worker to accept the HIT. Additionally, other actions can be restricted using the <code>ActionsGuarded</code> field on each <code>QualificationRequirement</code> structure. </p>"
         },
         "HITReviewStatus":{
           "shape":"HITReviewStatus",
@@ -1404,6 +1405,14 @@
       },
       "documentation":"<p> The HIT data structure represents a single HIT, including all the information necessary for a Worker to accept and complete the HIT.</p>"
     },
+    "HITAccessActions":{
+      "type":"string",
+      "enum":[
+        "Accept",
+        "PreviewAndAccept",
+        "DiscoverPreviewAndAccept"
+      ]
+    },
     "HITLayoutParameter":{
       "type":"structure",
       "required":[
@@ -2048,10 +2057,15 @@
         },
         "RequiredToPreview":{
           "shape":"Boolean",
-          "documentation":"<p> If true, the question data for the HIT will not be shown when a Worker whose Qualifications do not meet this requirement tries to preview the HIT. That is, a Worker's Qualifications must meet all of the requirements for which RequiredToPreview is true in order to preview the HIT. If a Worker meets all of the requirements where RequiredToPreview is true (or if there are no such requirements), but does not meet all of the requirements for the HIT, the Worker will be allowed to preview the HIT's question data, but will not be allowed to accept and complete the HIT. The default is false. </p>"
+          "documentation":"<p> DEPRECATED: Use the <code>ActionsGuarded</code> field instead. If RequiredToPreview is true, the question data for the HIT will not be shown when a Worker whose Qualifications do not meet this requirement tries to preview the HIT. That is, a Worker's Qualifications must meet all of the requirements for which RequiredToPreview is true in order to preview the HIT. If a Worker meets all of the requirements where RequiredToPreview is true (or if there are no such requirements), but does not meet all of the requirements for the HIT, the Worker will be allowed to preview the HIT's question data, but will not be allowed to accept and complete the HIT. The default is false. This should not be used in combination with the <code>ActionsGuarded</code> field. </p>",
+          "deprecated":true
+        },
+        "ActionsGuarded":{
+          "shape":"HITAccessActions",
+          "documentation":"<p> Setting this attribute prevents Workers whose Qualifications do not meet this QualificationRequirement from taking the specified action. Valid arguments include \"Accept\" (Worker cannot accept the HIT, but can preview the HIT and see it in their search results), \"PreviewAndAccept\" (Worker cannot accept or preview the HIT, but can see the HIT in their search results), and \"DiscoverPreviewAndAccept\" (Worker cannot accept, preview, or see the HIT in their search results). It's possible for you to create a HIT with multiple QualificationRequirements (which can have different values for the ActionGuarded attribute). In this case, the Worker is only permitted to perform an action when they have met all QualificationRequirements guarding the action. The actions in the order of least restrictive to most restrictive are Discover, Preview and Accept. For example, if a Worker meets all QualificationRequirements that are set to DiscoverPreviewAndAccept, but do not meet all requirements that are set with PreviewAndAccept, then the Worker will be able to Discover, i.e. see the HIT in their search result, but will not be able to Preview or Accept the HIT. ActionsGuarded should not be used in combination with the <code>RequiredToPreview</code> field. </p>"
         }
       },
-      "documentation":"<p> The QualificationRequirement data structure describes a Qualification that a Worker must have before the Worker is allowed to accept a HIT. A requirement may optionally state that a Worker must have the Qualification in order to preview the HIT. </p>"
+      "documentation":"<p> The QualificationRequirement data structure describes a Qualification that a Worker must have before the Worker is allowed to accept a HIT. A requirement may optionally state that a Worker must have the Qualification in order to preview the HIT, or see the HIT in search results. </p>"
     },
     "QualificationRequirementList":{
       "type":"list",
diff --git a/code-generation/api-descriptions/sts-2011-06-15.normal.json b/code-generation/api-descriptions/sts-2011-06-15.normal.json
index 7f433bb82c6..4be790cf06b 100644
--- a/code-generation/api-descriptions/sts-2011-06-15.normal.json
+++ b/code-generation/api-descriptions/sts-2011-06-15.normal.json
@@ -29,7 +29,7 @@
         {"shape":"PackedPolicyTooLargeException"},
         {"shape":"RegionDisabledException"}
       ],
-      "documentation":"<p>Returns a set of temporary security credentials (consisting of an access key ID, a secret access key, and a security token) that you can use to access AWS resources that you might not normally have access to. Typically, you use <code>AssumeRole</code> for cross-account access or federation. For a comparison of <code>AssumeRole</code> with the other APIs that produce temporary credentials, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html\">Requesting Temporary Security Credentials</a> and <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison\">Comparing the AWS STS APIs</a> in the <i>IAM User Guide</i>.</p> <p> <b>Important:</b> You cannot call <code>AssumeRole</code> by using AWS root account credentials; access is denied. You must use credentials for an IAM user or an IAM role to call <code>AssumeRole</code>. </p> <p>For cross-account access, imagine that you own multiple accounts and need to access resources in each account. You could create long-term credentials in each account to access those resources. However, managing all those credentials and remembering which one can access which account can be time consuming. Instead, you can create one set of long-term credentials in one account and then use temporary security credentials to access all the other accounts by assuming roles in those accounts. For more information about roles, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/roles-toplevel.html\">IAM Roles (Delegation and Federation)</a> in the <i>IAM User Guide</i>. </p> <p>For federation, you can, for example, grant single sign-on access to the AWS Management Console. If you already have an identity and authentication system in your corporate network, you don't have to recreate user identities in AWS in order to grant those user identities access to AWS. Instead, after a user has been authenticated, you call <code>AssumeRole</code> (and specify the role with the appropriate permissions) to get temporary security credentials for that user. With those temporary security credentials, you construct a sign-in URL that users can use to access the console. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp.html#sts-introduction\">Common Scenarios for Temporary Credentials</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security credentials are valid for the duration that you specified when calling <code>AssumeRole</code>, which can be from 900 seconds (15 minutes) to a maximum of 3600 seconds (1 hour). The default is 1 hour. </p> <p>The temporary security credentials created by <code>AssumeRole</code> can be used to make API calls to any AWS service with the following exception: you cannot call the STS service's <code>GetFederationToken</code> or <code>GetSessionToken</code> APIs.</p> <p>Optionally, you can pass an IAM access policy to this operation. If you choose not to pass a policy, the temporary security credentials that are returned by the operation have the permissions that are defined in the access policy of the role that is being assumed. If you pass a policy to this operation, the temporary security credentials that are returned by the operation have the permissions that are allowed by both the access policy of the role that is being assumed, <i> <b>and</b> </i> the policy that you pass. This gives you a way to further restrict the permissions for the resulting temporary security credentials. You cannot use the passed policy to grant permissions that are in excess of those allowed by the access policy of the role that is being assumed. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_assumerole.html\">Permissions for AssumeRole, AssumeRoleWithSAML, and AssumeRoleWithWebIdentity</a> in the <i>IAM User Guide</i>.</p> <p>To assume a role, your AWS account must be trusted by the role. The trust relationship is defined in the role's trust policy when the role is created. That trust policy states which accounts are allowed to delegate access to this account's role. </p> <p>The user who wants to access the role must also have permissions delegated from the role's administrator. If the user is in a different account than the role, then the user's administrator must attach a policy that allows the user to call AssumeRole on the ARN of the role in the other account. If the user is in the same account as the role, then you can either attach a policy to the user (identical to the previous different account user), or you can add the user as a principal directly in the role's trust policy. In this case, the trust policy acts as the only resource-based policy in IAM, and users in the same account as the role do not need explicit permission to assume the role. For more information about trust policies and resource-based policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html\">IAM Policies</a> in the <i>IAM User Guide</i>.</p> <p> <b>Using MFA with AssumeRole</b> </p> <p>You can optionally include multi-factor authentication (MFA) information when you call <code>AssumeRole</code>. This is useful for cross-account scenarios in which you want to make sure that the user who is assuming the role has been authenticated using an AWS MFA device. In that scenario, the trust policy of the role being assumed includes a condition that tests for MFA authentication; if the caller does not include valid MFA information, the request to assume the role is denied. The condition in a trust policy that tests for MFA authentication might look like the following example.</p> <p> <code>\"Condition\": {\"Bool\": {\"aws:MultiFactorAuthPresent\": true}}</code> </p> <p>For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/MFAProtectedAPI.html\">Configuring MFA-Protected API Access</a> in the <i>IAM User Guide</i> guide.</p> <p>To use MFA with <code>AssumeRole</code>, you pass values for the <code>SerialNumber</code> and <code>TokenCode</code> parameters. The <code>SerialNumber</code> value identifies the user's hardware or virtual MFA device. The <code>TokenCode</code> is the time-based one-time password (TOTP) that the MFA devices produces. </p>"
+      "documentation":"<p>Returns a set of temporary security credentials (consisting of an access key ID, a secret access key, and a security token) that you can use to access AWS resources that you might not normally have access to. Typically, you use <code>AssumeRole</code> for cross-account access or federation. For a comparison of <code>AssumeRole</code> with the other APIs that produce temporary credentials, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html\">Requesting Temporary Security Credentials</a> and <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison\">Comparing the AWS STS APIs</a> in the <i>IAM User Guide</i>.</p> <p> <b>Important:</b> You cannot call <code>AssumeRole</code> by using AWS root account credentials; access is denied. You must use credentials for an IAM user or an IAM role to call <code>AssumeRole</code>. </p> <p>For cross-account access, imagine that you own multiple accounts and need to access resources in each account. You could create long-term credentials in each account to access those resources. However, managing all those credentials and remembering which one can access which account can be time consuming. Instead, you can create one set of long-term credentials in one account and then use temporary security credentials to access all the other accounts by assuming roles in those accounts. For more information about roles, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/roles-toplevel.html\">IAM Roles (Delegation and Federation)</a> in the <i>IAM User Guide</i>. </p> <p>For federation, you can, for example, grant single sign-on access to the AWS Management Console. If you already have an identity and authentication system in your corporate network, you don't have to recreate user identities in AWS in order to grant those user identities access to AWS. Instead, after a user has been authenticated, you call <code>AssumeRole</code> (and specify the role with the appropriate permissions) to get temporary security credentials for that user. With those temporary security credentials, you construct a sign-in URL that users can use to access the console. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp.html#sts-introduction\">Common Scenarios for Temporary Credentials</a> in the <i>IAM User Guide</i>.</p> <p>By default, the temporary security credentials created by <code>AssumeRole</code> last for one hour. However, you can use the optional <code>DurationSeconds</code> parameter to specify the duration of your session. You can provide a value from 900 seconds (15 minutes) up to the maximum session duration setting for the role. This setting can have a value from 1 hour to 12 hours. To learn how to view the maximum value for your role, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session\">View the Maximum Session Duration Setting for a Role</a> in the <i>IAM User Guide</i>. The maximum session duration limit applies when you use the <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI operations but does not apply when you use those operations to create a console URL. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html\">Using IAM Roles</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security credentials created by <code>AssumeRole</code> can be used to make API calls to any AWS service with the following exception: you cannot call the STS service's <code>GetFederationToken</code> or <code>GetSessionToken</code> APIs.</p> <p>Optionally, you can pass an IAM access policy to this operation. If you choose not to pass a policy, the temporary security credentials that are returned by the operation have the permissions that are defined in the access policy of the role that is being assumed. If you pass a policy to this operation, the temporary security credentials that are returned by the operation have the permissions that are allowed by both the access policy of the role that is being assumed, <i> <b>and</b> </i> the policy that you pass. This gives you a way to further restrict the permissions for the resulting temporary security credentials. You cannot use the passed policy to grant permissions that are in excess of those allowed by the access policy of the role that is being assumed. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_assumerole.html\">Permissions for AssumeRole, AssumeRoleWithSAML, and AssumeRoleWithWebIdentity</a> in the <i>IAM User Guide</i>.</p> <p>To assume a role, your AWS account must be trusted by the role. The trust relationship is defined in the role's trust policy when the role is created. That trust policy states which accounts are allowed to delegate access to this account's role. </p> <p>The user who wants to access the role must also have permissions delegated from the role's administrator. If the user is in a different account than the role, then the user's administrator must attach a policy that allows the user to call AssumeRole on the ARN of the role in the other account. If the user is in the same account as the role, then you can either attach a policy to the user (identical to the previous different account user), or you can add the user as a principal directly in the role's trust policy. In this case, the trust policy acts as the only resource-based policy in IAM, and users in the same account as the role do not need explicit permission to assume the role. For more information about trust policies and resource-based policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html\">IAM Policies</a> in the <i>IAM User Guide</i>.</p> <p> <b>Using MFA with AssumeRole</b> </p> <p>You can optionally include multi-factor authentication (MFA) information when you call <code>AssumeRole</code>. This is useful for cross-account scenarios in which you want to make sure that the user who is assuming the role has been authenticated using an AWS MFA device. In that scenario, the trust policy of the role being assumed includes a condition that tests for MFA authentication; if the caller does not include valid MFA information, the request to assume the role is denied. The condition in a trust policy that tests for MFA authentication might look like the following example.</p> <p> <code>\"Condition\": {\"Bool\": {\"aws:MultiFactorAuthPresent\": true}}</code> </p> <p>For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/MFAProtectedAPI.html\">Configuring MFA-Protected API Access</a> in the <i>IAM User Guide</i> guide.</p> <p>To use MFA with <code>AssumeRole</code>, you pass values for the <code>SerialNumber</code> and <code>TokenCode</code> parameters. The <code>SerialNumber</code> value identifies the user's hardware or virtual MFA device. The <code>TokenCode</code> is the time-based one-time password (TOTP) that the MFA devices produces. </p>"
     },
     "AssumeRoleWithSAML":{
       "name":"AssumeRoleWithSAML",
@@ -50,7 +50,7 @@
         {"shape":"ExpiredTokenException"},
         {"shape":"RegionDisabledException"}
       ],
-      "documentation":"<p>Returns a set of temporary security credentials for users who have been authenticated via a SAML authentication response. This operation provides a mechanism for tying an enterprise identity store or directory to role-based AWS access without user-specific credentials or configuration. For a comparison of <code>AssumeRoleWithSAML</code> with the other APIs that produce temporary credentials, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html\">Requesting Temporary Security Credentials</a> and <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison\">Comparing the AWS STS APIs</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security credentials returned by this operation consist of an access key ID, a secret access key, and a security token. Applications can use these temporary security credentials to sign calls to AWS services.</p> <p>The temporary security credentials are valid for the duration that you specified when calling <code>AssumeRole</code>, or until the time specified in the SAML authentication response's <code>SessionNotOnOrAfter</code> value, whichever is shorter. The duration can be from 900 seconds (15 minutes) to a maximum of 3600 seconds (1 hour). The default is 1 hour.</p> <p>The temporary security credentials created by <code>AssumeRoleWithSAML</code> can be used to make API calls to any AWS service with the following exception: you cannot call the STS service's <code>GetFederationToken</code> or <code>GetSessionToken</code> APIs.</p> <p>Optionally, you can pass an IAM access policy to this operation. If you choose not to pass a policy, the temporary security credentials that are returned by the operation have the permissions that are defined in the access policy of the role that is being assumed. If you pass a policy to this operation, the temporary security credentials that are returned by the operation have the permissions that are allowed by the intersection of both the access policy of the role that is being assumed, <i> <b>and</b> </i> the policy that you pass. This means that both policies must grant the permission for the action to be allowed. This gives you a way to further restrict the permissions for the resulting temporary security credentials. You cannot use the passed policy to grant permissions that are in excess of those allowed by the access policy of the role that is being assumed. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_assumerole.html\">Permissions for AssumeRole, AssumeRoleWithSAML, and AssumeRoleWithWebIdentity</a> in the <i>IAM User Guide</i>.</p> <p>Before your application can call <code>AssumeRoleWithSAML</code>, you must configure your SAML identity provider (IdP) to issue the claims required by AWS. Additionally, you must use AWS Identity and Access Management (IAM) to create a SAML provider entity in your AWS account that represents your identity provider, and create an IAM role that specifies this SAML provider in its trust policy. </p> <p>Calling <code>AssumeRoleWithSAML</code> does not require the use of AWS security credentials. The identity of the caller is validated by using keys in the metadata document that is uploaded for the SAML provider entity for your identity provider. </p> <important> <p>Calling <code>AssumeRoleWithSAML</code> can result in an entry in your AWS CloudTrail logs. The entry includes the value in the <code>NameID</code> element of the SAML assertion. We recommend that you use a NameIDType that is not associated with any personally identifiable information (PII). For example, you could instead use the Persistent Identifier (<code>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</code>).</p> </important> <p>For more information, see the following resources:</p> <ul> <li> <p> <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_saml.html\">About SAML 2.0-based Federation</a> in the <i>IAM User Guide</i>. </p> </li> <li> <p> <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_saml.html\">Creating SAML Identity Providers</a> in the <i>IAM User Guide</i>. </p> </li> <li> <p> <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_saml_relying-party.html\">Configuring a Relying Party and Claims</a> in the <i>IAM User Guide</i>. </p> </li> <li> <p> <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-idp_saml.html\">Creating a Role for SAML 2.0 Federation</a> in the <i>IAM User Guide</i>. </p> </li> </ul>"
+      "documentation":"<p>Returns a set of temporary security credentials for users who have been authenticated via a SAML authentication response. This operation provides a mechanism for tying an enterprise identity store or directory to role-based AWS access without user-specific credentials or configuration. For a comparison of <code>AssumeRoleWithSAML</code> with the other APIs that produce temporary credentials, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html\">Requesting Temporary Security Credentials</a> and <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison\">Comparing the AWS STS APIs</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security credentials returned by this operation consist of an access key ID, a secret access key, and a security token. Applications can use these temporary security credentials to sign calls to AWS services.</p> <p>By default, the temporary security credentials created by <code>AssumeRoleWithSAML</code> last for one hour. However, you can use the optional <code>DurationSeconds</code> parameter to specify the duration of your session. Your role session lasts for the duration that you specify, or until the time specified in the SAML authentication response's <code>SessionNotOnOrAfter</code> value, whichever is shorter. You can provide a <code>DurationSeconds</code> value from 900 seconds (15 minutes) up to the maximum session duration setting for the role. This setting can have a value from 1 hour to 12 hours. To learn how to view the maximum value for your role, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session\">View the Maximum Session Duration Setting for a Role</a> in the <i>IAM User Guide</i>. The maximum session duration limit applies when you use the <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI operations but does not apply when you use those operations to create a console URL. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html\">Using IAM Roles</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security credentials created by <code>AssumeRoleWithSAML</code> can be used to make API calls to any AWS service with the following exception: you cannot call the STS service's <code>GetFederationToken</code> or <code>GetSessionToken</code> APIs.</p> <p>Optionally, you can pass an IAM access policy to this operation. If you choose not to pass a policy, the temporary security credentials that are returned by the operation have the permissions that are defined in the access policy of the role that is being assumed. If you pass a policy to this operation, the temporary security credentials that are returned by the operation have the permissions that are allowed by the intersection of both the access policy of the role that is being assumed, <i> <b>and</b> </i> the policy that you pass. This means that both policies must grant the permission for the action to be allowed. This gives you a way to further restrict the permissions for the resulting temporary security credentials. You cannot use the passed policy to grant permissions that are in excess of those allowed by the access policy of the role that is being assumed. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_assumerole.html\">Permissions for AssumeRole, AssumeRoleWithSAML, and AssumeRoleWithWebIdentity</a> in the <i>IAM User Guide</i>.</p> <p>Before your application can call <code>AssumeRoleWithSAML</code>, you must configure your SAML identity provider (IdP) to issue the claims required by AWS. Additionally, you must use AWS Identity and Access Management (IAM) to create a SAML provider entity in your AWS account that represents your identity provider, and create an IAM role that specifies this SAML provider in its trust policy. </p> <p>Calling <code>AssumeRoleWithSAML</code> does not require the use of AWS security credentials. The identity of the caller is validated by using keys in the metadata document that is uploaded for the SAML provider entity for your identity provider. </p> <important> <p>Calling <code>AssumeRoleWithSAML</code> can result in an entry in your AWS CloudTrail logs. The entry includes the value in the <code>NameID</code> element of the SAML assertion. We recommend that you use a NameIDType that is not associated with any personally identifiable information (PII). For example, you could instead use the Persistent Identifier (<code>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</code>).</p> </important> <p>For more information, see the following resources:</p> <ul> <li> <p> <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_saml.html\">About SAML 2.0-based Federation</a> in the <i>IAM User Guide</i>. </p> </li> <li> <p> <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_saml.html\">Creating SAML Identity Providers</a> in the <i>IAM User Guide</i>. </p> </li> <li> <p> <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_saml_relying-party.html\">Configuring a Relying Party and Claims</a> in the <i>IAM User Guide</i>. </p> </li> <li> <p> <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-idp_saml.html\">Creating a Role for SAML 2.0 Federation</a> in the <i>IAM User Guide</i>. </p> </li> </ul>"
     },
     "AssumeRoleWithWebIdentity":{
       "name":"AssumeRoleWithWebIdentity",
@@ -72,7 +72,7 @@
         {"shape":"ExpiredTokenException"},
         {"shape":"RegionDisabledException"}
       ],
-      "documentation":"<p>Returns a set of temporary security credentials for users who have been authenticated in a mobile or web application with a web identity provider, such as Amazon Cognito, Login with Amazon, Facebook, Google, or any OpenID Connect-compatible identity provider.</p> <note> <p>For mobile applications, we recommend that you use Amazon Cognito. You can use Amazon Cognito with the <a href=\"http://aws.amazon.com/sdkforios/\">AWS SDK for iOS</a> and the <a href=\"http://aws.amazon.com/sdkforandroid/\">AWS SDK for Android</a> to uniquely identify a user and supply the user with a consistent identity throughout the lifetime of an application.</p> <p>To learn more about Amazon Cognito, see <a href=\"http://docs.aws.amazon.com/mobile/sdkforandroid/developerguide/cognito-auth.html#d0e840\">Amazon Cognito Overview</a> in the <i>AWS SDK for Android Developer Guide</i> guide and <a href=\"http://docs.aws.amazon.com/mobile/sdkforios/developerguide/cognito-auth.html#d0e664\">Amazon Cognito Overview</a> in the <i>AWS SDK for iOS Developer Guide</i>.</p> </note> <p>Calling <code>AssumeRoleWithWebIdentity</code> does not require the use of AWS security credentials. Therefore, you can distribute an application (for example, on mobile devices) that requests temporary security credentials without including long-term AWS credentials in the application, and without deploying server-based proxy services that use long-term AWS credentials. Instead, the identity of the caller is validated by using a token from the web identity provider. For a comparison of <code>AssumeRoleWithWebIdentity</code> with the other APIs that produce temporary credentials, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html\">Requesting Temporary Security Credentials</a> and <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison\">Comparing the AWS STS APIs</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security credentials returned by this API consist of an access key ID, a secret access key, and a security token. Applications can use these temporary security credentials to sign calls to AWS service APIs.</p> <p>The credentials are valid for the duration that you specified when calling <code>AssumeRoleWithWebIdentity</code>, which can be from 900 seconds (15 minutes) to a maximum of 3600 seconds (1 hour). The default is 1 hour. </p> <p>The temporary security credentials created by <code>AssumeRoleWithWebIdentity</code> can be used to make API calls to any AWS service with the following exception: you cannot call the STS service's <code>GetFederationToken</code> or <code>GetSessionToken</code> APIs.</p> <p>Optionally, you can pass an IAM access policy to this operation. If you choose not to pass a policy, the temporary security credentials that are returned by the operation have the permissions that are defined in the access policy of the role that is being assumed. If you pass a policy to this operation, the temporary security credentials that are returned by the operation have the permissions that are allowed by both the access policy of the role that is being assumed, <i> <b>and</b> </i> the policy that you pass. This gives you a way to further restrict the permissions for the resulting temporary security credentials. You cannot use the passed policy to grant permissions that are in excess of those allowed by the access policy of the role that is being assumed. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_assumerole.html\">Permissions for AssumeRole, AssumeRoleWithSAML, and AssumeRoleWithWebIdentity</a> in the <i>IAM User Guide</i>.</p> <p>Before your application can call <code>AssumeRoleWithWebIdentity</code>, you must have an identity token from a supported identity provider and create a role that the application can assume. The role that your application assumes must trust the identity provider that is associated with the identity token. In other words, the identity provider must be specified in the role's trust policy. </p> <important> <p>Calling <code>AssumeRoleWithWebIdentity</code> can result in an entry in your AWS CloudTrail logs. The entry includes the <a href=\"http://openid.net/specs/openid-connect-core-1_0.html#Claims\">Subject</a> of the provided Web Identity Token. We recommend that you avoid using any personally identifiable information (PII) in this field. For example, you could instead use a GUID or a pairwise identifier, as <a href=\"http://openid.net/specs/openid-connect-core-1_0.html#SubjectIDTypes\">suggested in the OIDC specification</a>.</p> </important> <p>For more information about how to use web identity federation and the <code>AssumeRoleWithWebIdentity</code> API, see the following resources: </p> <ul> <li> <p> <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_oidc_manual.html\">Using Web Identity Federation APIs for Mobile Apps</a> and <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#api_assumerolewithwebidentity\">Federation Through a Web-based Identity Provider</a>. </p> </li> <li> <p> <a href=\"https://web-identity-federation-playground.s3.amazonaws.com/index.html\"> Web Identity Federation Playground</a>. This interactive website lets you walk through the process of authenticating via Login with Amazon, Facebook, or Google, getting temporary security credentials, and then using those credentials to make a request to AWS. </p> </li> <li> <p> <a href=\"http://aws.amazon.com/sdkforios/\">AWS SDK for iOS</a> and <a href=\"http://aws.amazon.com/sdkforandroid/\">AWS SDK for Android</a>. These toolkits contain sample apps that show how to invoke the identity providers, and then how to use the information from these providers to get and use temporary security credentials. </p> </li> <li> <p> <a href=\"http://aws.amazon.com/articles/web-identity-federation-with-mobile-applications\">Web Identity Federation with Mobile Applications</a>. This article discusses web identity federation and shows an example of how to use web identity federation to get access to content in Amazon S3. </p> </li> </ul>"
+      "documentation":"<p>Returns a set of temporary security credentials for users who have been authenticated in a mobile or web application with a web identity provider, such as Amazon Cognito, Login with Amazon, Facebook, Google, or any OpenID Connect-compatible identity provider.</p> <note> <p>For mobile applications, we recommend that you use Amazon Cognito. You can use Amazon Cognito with the <a href=\"http://aws.amazon.com/sdkforios/\">AWS SDK for iOS</a> and the <a href=\"http://aws.amazon.com/sdkforandroid/\">AWS SDK for Android</a> to uniquely identify a user and supply the user with a consistent identity throughout the lifetime of an application.</p> <p>To learn more about Amazon Cognito, see <a href=\"http://docs.aws.amazon.com/mobile/sdkforandroid/developerguide/cognito-auth.html#d0e840\">Amazon Cognito Overview</a> in the <i>AWS SDK for Android Developer Guide</i> guide and <a href=\"http://docs.aws.amazon.com/mobile/sdkforios/developerguide/cognito-auth.html#d0e664\">Amazon Cognito Overview</a> in the <i>AWS SDK for iOS Developer Guide</i>.</p> </note> <p>Calling <code>AssumeRoleWithWebIdentity</code> does not require the use of AWS security credentials. Therefore, you can distribute an application (for example, on mobile devices) that requests temporary security credentials without including long-term AWS credentials in the application, and without deploying server-based proxy services that use long-term AWS credentials. Instead, the identity of the caller is validated by using a token from the web identity provider. For a comparison of <code>AssumeRoleWithWebIdentity</code> with the other APIs that produce temporary credentials, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html\">Requesting Temporary Security Credentials</a> and <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison\">Comparing the AWS STS APIs</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security credentials returned by this API consist of an access key ID, a secret access key, and a security token. Applications can use these temporary security credentials to sign calls to AWS service APIs.</p> <p>By default, the temporary security credentials created by <code>AssumeRoleWithWebIdentity</code> last for one hour. However, you can use the optional <code>DurationSeconds</code> parameter to specify the duration of your session. You can provide a value from 900 seconds (15 minutes) up to the maximum session duration setting for the role. This setting can have a value from 1 hour to 12 hours. To learn how to view the maximum value for your role, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session\">View the Maximum Session Duration Setting for a Role</a> in the <i>IAM User Guide</i>. The maximum session duration limit applies when you use the <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI operations but does not apply when you use those operations to create a console URL. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html\">Using IAM Roles</a> in the <i>IAM User Guide</i>. </p> <p>The temporary security credentials created by <code>AssumeRoleWithWebIdentity</code> can be used to make API calls to any AWS service with the following exception: you cannot call the STS service's <code>GetFederationToken</code> or <code>GetSessionToken</code> APIs.</p> <p>Optionally, you can pass an IAM access policy to this operation. If you choose not to pass a policy, the temporary security credentials that are returned by the operation have the permissions that are defined in the access policy of the role that is being assumed. If you pass a policy to this operation, the temporary security credentials that are returned by the operation have the permissions that are allowed by both the access policy of the role that is being assumed, <i> <b>and</b> </i> the policy that you pass. This gives you a way to further restrict the permissions for the resulting temporary security credentials. You cannot use the passed policy to grant permissions that are in excess of those allowed by the access policy of the role that is being assumed. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_assumerole.html\">Permissions for AssumeRole, AssumeRoleWithSAML, and AssumeRoleWithWebIdentity</a> in the <i>IAM User Guide</i>.</p> <p>Before your application can call <code>AssumeRoleWithWebIdentity</code>, you must have an identity token from a supported identity provider and create a role that the application can assume. The role that your application assumes must trust the identity provider that is associated with the identity token. In other words, the identity provider must be specified in the role's trust policy. </p> <important> <p>Calling <code>AssumeRoleWithWebIdentity</code> can result in an entry in your AWS CloudTrail logs. The entry includes the <a href=\"http://openid.net/specs/openid-connect-core-1_0.html#Claims\">Subject</a> of the provided Web Identity Token. We recommend that you avoid using any personally identifiable information (PII) in this field. For example, you could instead use a GUID or a pairwise identifier, as <a href=\"http://openid.net/specs/openid-connect-core-1_0.html#SubjectIDTypes\">suggested in the OIDC specification</a>.</p> </important> <p>For more information about how to use web identity federation and the <code>AssumeRoleWithWebIdentity</code> API, see the following resources: </p> <ul> <li> <p> <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_oidc_manual.html\">Using Web Identity Federation APIs for Mobile Apps</a> and <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#api_assumerolewithwebidentity\">Federation Through a Web-based Identity Provider</a>. </p> </li> <li> <p> <a href=\"https://web-identity-federation-playground.s3.amazonaws.com/index.html\"> Web Identity Federation Playground</a>. This interactive website lets you walk through the process of authenticating via Login with Amazon, Facebook, or Google, getting temporary security credentials, and then using those credentials to make a request to AWS. </p> </li> <li> <p> <a href=\"http://aws.amazon.com/sdkforios/\">AWS SDK for iOS</a> and <a href=\"http://aws.amazon.com/sdkforandroid/\">AWS SDK for Android</a>. These toolkits contain sample apps that show how to invoke the identity providers, and then how to use the information from these providers to get and use temporary security credentials. </p> </li> <li> <p> <a href=\"http://aws.amazon.com/articles/web-identity-federation-with-mobile-applications\">Web Identity Federation with Mobile Applications</a>. This article discusses web identity federation and shows an example of how to use web identity federation to get access to content in Amazon S3. </p> </li> </ul>"
     },
     "DecodeAuthorizationMessage":{
       "name":"DecodeAuthorizationMessage",
@@ -160,7 +160,7 @@
         },
         "DurationSeconds":{
           "shape":"roleDurationSecondsType",
-          "documentation":"<p>The duration, in seconds, of the role session. The value can range from 900 seconds (15 minutes) to 3600 seconds (1 hour). By default, the value is set to 3600 seconds.</p> <note> <p>This is separate from the duration of a console session that you might request using the returned credentials. The request to the federation endpoint for a console sign-in token takes a <code>SessionDuration</code> parameter that specifies the maximum length of the console session, separately from the <code>DurationSeconds</code> parameter on this API. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html\">Creating a URL that Enables Federated Users to Access the AWS Management Console</a> in the <i>IAM User Guide</i>.</p> </note>"
+          "documentation":"<p>The duration, in seconds, of the role session. The value can range from 900 seconds (15 minutes) up to the maximum session duration setting for the role. This setting can have a value from 1 hour to 12 hours. If you specify a value higher than this setting, the operation fails. For example, if you specify a session duration of 12 hours, but your administrator set the maximum session duration to 6 hours, your operation fails. To learn how to view the maximum value for your role, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session\">View the Maximum Session Duration Setting for a Role</a> in the <i>IAM User Guide</i>.</p> <p>By default, the value is set to 3600 seconds. </p> <note> <p>The <code>DurationSeconds</code> parameter is separate from the duration of a console session that you might request using the returned credentials. The request to the federation endpoint for a console sign-in token takes a <code>SessionDuration</code> parameter that specifies the maximum length of the console session. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html\">Creating a URL that Enables Federated Users to Access the AWS Management Console</a> in the <i>IAM User Guide</i>.</p> </note>"
         },
         "ExternalId":{
           "shape":"externalIdType",
@@ -220,7 +220,7 @@
         },
         "DurationSeconds":{
           "shape":"roleDurationSecondsType",
-          "documentation":"<p>The duration, in seconds, of the role session. The value can range from 900 seconds (15 minutes) to 3600 seconds (1 hour). By default, the value is set to 3600 seconds. An expiration can also be specified in the SAML authentication response's <code>SessionNotOnOrAfter</code> value. The actual expiration time is whichever value is shorter. </p> <note> <p>This is separate from the duration of a console session that you might request using the returned credentials. The request to the federation endpoint for a console sign-in token takes a <code>SessionDuration</code> parameter that specifies the maximum length of the console session, separately from the <code>DurationSeconds</code> parameter on this API. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-saml.html\">Enabling SAML 2.0 Federated Users to Access the AWS Management Console</a> in the <i>IAM User Guide</i>.</p> </note>"
+          "documentation":"<p>The duration, in seconds, of the role session. Your role session lasts for the duration that you specify for the <code>DurationSeconds</code> parameter, or until the time specified in the SAML authentication response's <code>SessionNotOnOrAfter</code> value, whichever is shorter. You can provide a <code>DurationSeconds</code> value from 900 seconds (15 minutes) up to the maximum session duration setting for the role. This setting can have a value from 1 hour to 12 hours. If you specify a value higher than this setting, the operation fails. For example, if you specify a session duration of 12 hours, but your administrator set the maximum session duration to 6 hours, your operation fails. To learn how to view the maximum value for your role, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session\">View the Maximum Session Duration Setting for a Role</a> in the <i>IAM User Guide</i>.</p> <p>By default, the value is set to 3600 seconds. </p> <note> <p>The <code>DurationSeconds</code> parameter is separate from the duration of a console session that you might request using the returned credentials. The request to the federation endpoint for a console sign-in token takes a <code>SessionDuration</code> parameter that specifies the maximum length of the console session. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html\">Creating a URL that Enables Federated Users to Access the AWS Management Console</a> in the <i>IAM User Guide</i>.</p> </note>"
         }
       }
     },
@@ -292,7 +292,7 @@
         },
         "DurationSeconds":{
           "shape":"roleDurationSecondsType",
-          "documentation":"<p>The duration, in seconds, of the role session. The value can range from 900 seconds (15 minutes) to 3600 seconds (1 hour). By default, the value is set to 3600 seconds.</p> <note> <p>This is separate from the duration of a console session that you might request using the returned credentials. The request to the federation endpoint for a console sign-in token takes a <code>SessionDuration</code> parameter that specifies the maximum length of the console session, separately from the <code>DurationSeconds</code> parameter on this API. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html\">Creating a URL that Enables Federated Users to Access the AWS Management Console</a> in the <i>IAM User Guide</i>.</p> </note>"
+          "documentation":"<p>The duration, in seconds, of the role session. The value can range from 900 seconds (15 minutes) up to the maximum session duration setting for the role. This setting can have a value from 1 hour to 12 hours. If you specify a value higher than this setting, the operation fails. For example, if you specify a session duration of 12 hours, but your administrator set the maximum session duration to 6 hours, your operation fails. To learn how to view the maximum value for your role, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session\">View the Maximum Session Duration Setting for a Role</a> in the <i>IAM User Guide</i>.</p> <p>By default, the value is set to 3600 seconds. </p> <note> <p>The <code>DurationSeconds</code> parameter is separate from the duration of a console session that you might request using the returned credentials. The request to the federation endpoint for a console sign-in token takes a <code>SessionDuration</code> parameter that specifies the maximum length of the console session. For more information, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html\">Creating a URL that Enables Federated Users to Access the AWS Management Console</a> in the <i>IAM User Guide</i>.</p> </note>"
         }
       }
     },
@@ -673,7 +673,7 @@
     "regionDisabledMessage":{"type":"string"},
     "roleDurationSecondsType":{
       "type":"integer",
-      "max":3600,
+      "max":43200,
       "min":900
     },
     "roleSessionNameType":{