Scheduler fix

Merged github-pop requested to merge scheduler-fix into modular

Merge request reports