[HK-299] - JIRA