Issue refs #1523: done