Single metric target for performance

Merged Ernst van Nierop requested to merge evn-single-metric-for-performance into master

Simplifying things for everyone.

\cc @sitschner @edjdev