Issue refs #1681: done