[PD-dev] [GEM] Further CVS changes