BUG 11021 IMPROVEMENT
Merge pull request #1461 from julceslauhub/master

BUG 11021 IMPROVEMENT