little housekeeping
Merge origin/master
added test for wrong top distinct order.