Merge branch 'master' into master-dev-merge

26 jobs for aws-char-encoding in 85 minutes and 52 seconds (queued for 4 seconds)