Improvement related to the bug 13504
Merge pull request #2167 from julceslauhub/master

Improvement related to the bug 13504