Merged v1.55 to trunk