[CAP-228] - Jira