[HK-473] - JIRA