Merge branch 'metrics_restructure'