Merge "SF Timestats: add new metrics"