Merge branch 'deserialization' into springified-consumer--serialization