Fixed bug #5845 (Aurore's work)
Merge branch 'bug-5845-from-work-of-aurore' into core-5.14.x