Merge "Task affinity updates"