Merge "TaskConfiguration refactoring - part 1/3"