Merge branch 'aws-integration-merge-estepamo' into 'master'

Morris Esteparequested to merge
cherry-pick-3dd3ffc5 into release/0.19

Original MR: !440 (merged)

Edited by David Diederich

Merge request reports