Unique should work with objects.
Merge branch 'discovery_cache' into new_21190