[development] CVS issues