Jira issue PSCSX-600