[PD-dev] backporting [list]