Merged changes from 1.65 to trunk