Merge "Adding missing passthrough of task affiliate id."