Merged v1.60-no-compile into v1.60