Merge branch 't/gui_sched'