fixing bug #5953
Merge branch 'bug-5953' into components-5.14.x