[CPWG] Revised EPDP Advice