refs #835 - merge FB