fixing bug #6072
Merge branch 'bug-6072' into core-5.14.x