[[ Bug 14046 ]] Apply the bugfix 11485 (was not ported to 7.0)
Merge pull request #1543 from runrevsebastien/bugfix-14046

[[ Bug 14046 ]] Apply the bugfix 11485 (was not ported to 7.0)