[SR6-619] - Jira