Closes https://eeproyectos.atlassian.net/jira/software/projects/DPI/boards/42/backlog?selectedIssue=DPI-185