Serialization changes : Earlier checkin caused merged conflicts