Merge "Fixed serialization"