Update AWS version to match core

Merged Matt Wise requested to merge patch-1 into master

Merge request reports