[PD-dev] [GEM] CVS changes