Merge branch 'sb/perf-without-installed-git' into maint