Merge "Clean up and cover more QS metrics"