Fixed message deserialization bugs
Merge branch 'feature-message-serialization' into develop