[CLJ-2564] - JIRA