adding taskCount and task id everywhere
Merge remote-tracking branch 'origin/master'