NF+MRG: support surface-to-surface neighborhoods