Merge "SF TimeStats: fix a hazard issue"