BUG 5965 IMPROVEMENT
Merge pull request #1459 from julceslauhub/master

BUG 5965 IMPROVEMENT