refs #1540 : enhancement - backport to 1.9