Merge branch 'master' into deduplicate-version

9 jobs for deduplicate-version in 11 minutes and 32 seconds (queued for 8 seconds)