Merge branch 'ks/perf-build-with-autoconf'