Merge "add a "long" type to MFF structs"