[Vm-dev] [patch] Make NAS optional