Issue refs #1766: done