[ZNTA-793] - JIRA