Merge remote-tracking branch 'alexis/prepare-for-ffi'