[ZNTA-653] - JIRA