Merged f2d7 from v1.55 to v1.60