Build NRV in 2.10.2 by default

Still working on cleaning up project