Jira issue PSCSX-678