merged for 2.5.5 #5537