updated again for taskgroup recent changes
Merge branch 'dev'