Fix finder behaviour: empty collection conversion to single element
Merge remote-tracking branch 'origin/master'