Merged from v1.65-experimental