refs #522, #532, #531