Bug 960491 - Add flatfish support