Merge branch 't/sched_cleanups'