components #5.12.x :  fixed bug#4731