Merged v1.61 to trunk