BUG 10953 IMPROVEMENT
Merge pull request #1446 from julceslauhub/master

BUG 10953 IMPROVEMENT