Make garbage collection work with only the task_name.
Merge remote-tracking branch 'origin/master'