Merged from v1.80