Merged v1.55 into v1.60