Backport the PCDM fixes to 10.0