Issue refs #1680: done