[XWS-1913] - Jira