Jira issue PSCSX-511