Jira issue PSCSX-597
Jira issue PSCSX-597(missing file)
Merge pull request #1394 from TMMeilleur/1.6

Jira issue PSCSX-597