Merge "Tidy ups in preparation for adding metrics" into sc-dev