Merge "fix broken logTimeStat stuff"