Merge branch 'privat' into deserialization