metricRef -> metricDef (oops)
Merge branch 'master' into develop