Issue refs #1427: done