Merge: Fix support for Byte in the FFI