Jira issue PSCSX-670