Merge branch 'dev-gestion-vignettes'