Merge branch 'enlarge_ffi_syntax' into merge_ffi