BUGS 14025 and 14476 IMPROVEMENETS
Merge pull request #2322 from julceslauhub/master

BUGS 14025 and 14476 IMPROVEMENTS