refs #337 - merge FB