Merge "Fix possible infinite loop in ScheduleConfig"