Scheduler refactor, fix processing order Closes #712 See merge request !1067
mentioned in issue #873 (closed)