Merge "changes to ensure pap/pdps comes healthy"