[REM] Removed NIF handlig now branch is stable.