Issue refs #1379: done