Halfway working, will continue later.
Merge branch 'refs/heads/ReorderingTasks'