Merged v1.65-try3 to trunk in prep to make v1.65