Fix bug #5621
Merge branch 'bug#5621' into core-5.15.x