Sync from FNTIO/aws-infrastructure-client@543c8a4
Sync from FNTIO/aws-infrastructure-client@6c12e0a
Sync from FNTIO/aws-infrastructure-client@a9502be