[TDDG-17] - JIRA