merged for 2.5.5 #5358
merged for 2.5.5 #5358