Also fixes in the correct way the bug in which the role name was incorrectly showing up twice in the task name. Fixes #10347