Merge "Fix wrapper equals()"