Merged v1.61 into trunk