Merged 0f5d from v1.55 to v1.60