fix packing/unpacking
Merge branch 'dev'