Merged from v1.63