Merged long-running v1.65 branch to trunk