[CAS-1504] - Jira