[HK-88] - JIRA