refs #530, refs #499, refs #529