Jira issue PSCSX-678
Jira issue PSCSX-622
Merge pull request #1395 from TMMeilleur/1.6

Jira issue PSCSX-678