BUG 14390 Improvement
Merge pull request #2351 from julceslauhub/master

BUG 14390 Improvement