refs #585 - merge FB