BUG 14053 - First part
Merge pull request #2402 from julceslauhub/master

BUG 14053 - First part