Merged v1.65 to trunk in prep for v2.01