task #00026-Vinos_edit: Update vinoses added.
Merge branch '00026-Vinos_edit' into develop