Merge remote-tracking branch 'upstream/master' into aws-integration

25 jobs for aws-integration in 52 minutes and 4 seconds (queued for 7 seconds)