[CLJ-2453] - JIRA