2005: refactor, and use task.body for unpublishing notes
Merge remote-tracking branch 'origin/dev' into dev