Properly clean up dependent and read tasks.
Merge branch 'master-working-2' into guwac