refs #380, refs #437
refs #380, refs #437