Fix metrics reporting.
Merge branch 'metrics' into develop