Merge "Add infrastructure for metrics" into sc-dev