[PD-dev] Re: cvs devel_0_36 changes