Merge "Make TimeDetectorService / Strategy consistent"