be more neutral in vignette
Merge branch 'maindev'