[HK-95] - JIRA