Merged v1.60 to bring in documentation