[CLJ-1403] - JIRA