merged from v1.65