CXX-187 Add distinct helper