Merge branch 'master' into dev

23 jobs for aws-integration in 36 minutes and 4 seconds (queued for 7 seconds)