Multiple points from Nearest...

Implements part of #1125, and is a correctly targeted version of #1146.
good catch, we have PR #1157 lined up to fix this.