[GDC-107] - JIRA