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

23 jobs for aws-fixes3 in 31 minutes and 53 seconds (queued for 3 seconds)