merge from master

24 jobs for aws-integration in 29 minutes (queued for 2 seconds)