[SHA-2441] - Jira