Merged v1.55 to v1.60