Sync with CVS (version: 2.9.8.3rc1)