AWS - Merge dev to master

AWS only changes

Improvements on AWS tests

Merge request reports

Loading