Merge remote-tracking branch 'origin/master' into dev

24 jobs for aws-integration in 252 minutes and 39 seconds (queued for 3 seconds)