Jira issue PSCSX-597