Merge "Add serialized name for typeVersion"