refs #607 - merge FB