Merged from v1.60