Merged v1.80