Merged from v1.65