Merge "take-1 for the NST selection function"