CORS Fix Update

Merged Spencer Sutton requested to merge aws-integration-only into master

Merge request reports