Fix huge CPU perf fail
Merge branch 'fix-perf'