sync with cvs 4.64cvs4