Merge "TimeDetector improvements"