TaskProcessor refactoring
Merge changes