Merge branch 'perf/probes' into perf/core