Fix nagvis setup
Merge remote-tracking branch 'upstream/kaji' into kaji