[HK-456] - JIRA