MAINT: Sync with last CVS version