Merged from v1.64