[TDDG-56] - JIRA