refs #656, #641
refs #641