Vnci fixes

Merged Antenore Gatta (tmow) requested to merge vnci-fixes into master

Should fix #1838 (closed)

Merge request reports