Merge aws dev to master

Jiman Kimrequested to merge
merge-aws-dev-to-master-dec-7 into master

Aws related changes.

Edited by Jiman Kim

Merge request reports