Merge "Implement equals and hashCode"