v2.5.5 #552