Issue refs #1529: done in tasks module (home module next)