[GAP-24] - Jira