Brought in in-progress nsfdata Javolution conversion