#660 - adapt to auto-timeslot creation