Merge "SchedulerController class fix"