Merge branch 't/sched_improvements'