Jira issue PSCSX - 477