[[ Bug 13026 ]] Bugfix added in 7.0
Merge pull request #1019 from runrevsebastien/bugfix-13026-7_0

Bugfix 13026 7 0