Merged v1.80 in