Merge remote-tracking branch 'acme/perf-tools' into perf-tools-next