[UY-1008] - Jira