Merge "Add serialVersionUID to Serializable classes"