sync with 0.7.4cvs21