Issue refs #1307: done