Merge "Fix enum serialization."