[HK-246] - JIRA