refs #185 - merge FB