fixed RVI
Merge branch 'rvifix' into dev