Merge "Add more metrics for QS" into nyc-dev