[PD-dev] devel_0_38 bug