BZ-10421 Initial integration of nefs