fixes for 14119
Merge pull request #2294 from smfontes/14119

Fixes for bug 14119