Inline the correct_time_range method
Merge branch 'master' into new-backend