Merge branch 'jt/perf-updates' into maint