Merged v1.60 into old dev branch