Merge branch 'master' into multithread-test-issue

17 jobs for multithread-test-issue in 9 minutes and 37 seconds (queued for 8 seconds)