Merge Schedules from devel branch

Merge Alex's commits