Merged v1.60 dev branch to trunk