[CLJ-2426] - JIRA