Added task reconciliation.
Merge branch 'task-reconciliation' into new-cluster