Fix metrics reporting.
Move default metrics reporting out of plugins.
Merge branch 'metrics' into develop