Merged v1.65 back to trunk