Jira issue PSCSX-511
Merge pull request #1393 from TMMeilleur/1.6

Jira issue PSCSX-511