[TDEPS-56] - JIRA