Merge "Prepare to make time detection more configurable"