Merge branch 'master' into tests

4 jobs for tests in 61 minutes and 26 seconds (queued for 2 minutes and 43 seconds)