[3.9] Updates to task manager