Merged v1.60 into trunk