[HK-320] - JIRA