Merged v1.60 development into trunk