components #5.13.x :  fixing bug #4982