core #5.13.x :   fixing bug #5598
core #5.13.x :   fixing bug #5218