Jira issue PSCSX-622