Merge "Metrics more of the things"