[HK-152] - JIRA