fixed merge for 2.5.5 #5591