Merge remote-tracking branch 'origin/dev' into aws-buildspec

29 jobs for aws-buildspec in 23 minutes and 48 seconds (queued for 4 seconds)