Issue refs #1862: done