[HK-410] - JIRA