Merge "SchedulerRestInterface class fix"