branchbefore/main/TimeRange refactor.cancel