Merged v1.65 to trunk