Merge branch 'master' into 189-speed-comparison

24 jobs for 189-speed-comparison in 60 minutes and 51 seconds (queued for 1 second)