[PD] More about PD state-saving