Merge branch 'ready/perf'