Merged v1.65 changes to trunk