Merge branch 'demo/aws' into 'develop'

testing in AWS environment

See merge request !12
1 job for develop in 1 minute and 28 seconds (queued for 9 seconds)