Merged from v1.64 into v1.65