Task #33428 Comment workflow changes (in progress)