[PD-dev] cvs devel_0_36 changes