sync with 0.7.6cvs21