Merge branch 'jk/perf-any-version'