Merge "Correctly handle infinite start time"