Issue refs #1835: done