Merge branch 'privat' into ready-for-ffi