Merge "Fix divergent equals and hashCode behavior" into nyc-dev