IMPROVEMENT for bug 11236
Merge pull request #1548 from julceslauhub/master

IMPROVEMENT for bug 11236