Merge "Implement equals and hashCode" into rvc-dev