Multiple points from Nearest...

Implements part of #1125, and is a correctly targeted version of #1146.
pls remove this