Issue refs #1686: done