Updated in line with AddTask change.
Merge remote-tracking branch 'origin/next' into demo