task #00026-Vinos_edit: Notices fix
Merge branch '00026-Vinos_edit' into develop