Merge remote-tracking branch 'acme/perf/urgent' into perf/core