more sync with 0.7.5cvs7