[[ Bug 12726 ]] Bug ported to 7.0
Merge pull request #1581 from runrevsebastien/bugfix-12726_7.0

[[ Bug 12726 ]] Bug ported to 7.0