Fix the displaying bug as well
Merge branch 'bug-5923' into core-5.14.x