Merge "Fix rescheduling of jobs with large periods." into tm-dev