Implementing workflow 'on-task-XXX' clauses

Change-Id: Ie173103ee3cfd60194b9a447e308d525da37f30d