[HK-71] - JIRA