Merge branch 'kb/perf-trace'