Merge branch 'jt/perf-updates'