Fix msgpack
Merge branch 'dev'