refs #1655 : cherry-pick upstream from 1.9 tree