Bug 960941 - Add flatfish support