[ZNTA-846] - JIRA