Fixed the way addresses are deserialized
Merge branch 'feature-address-deserialization-fixes' into develop