sync with 0.8.3cvs8