canvas version
Merge branch 'topic/vigs_noe2'