Added Amazon Web Service lookup.
Merge branch 'release/3.9.1.3'