Merge "Fix equals and hashCode methods"