Feature/scheduler

Merged username-removed-1366591 requested to merge feature/Scheduler into dev