Issue refs #1538: done