[PD-dev] PD cvs devel_0_36 additions