Merge commit 'e5fa335b0dffbd06385b6de05ae04b2bd2ea277e' * commit 'e5fa335b0dffbd06385b6de05ae04b2bd2ea277e': Make perf metrics collection & output via instrumentation simpler
Merge commit 'e5fa335b0dffbd06385b6de05ae04b2bd2ea277e' * commit 'e5fa335b0dffbd06385b6de05ae04b2bd2ea277e': Make perf metrics collection & output via instrumentation simpler