merged for 2.5.5 #5257
merged for 2.5.5 #5257
#5257