Chore/scheduler cleanups

Merge request reports

Loading