[PD-dev] PD devel_0_37 problems