Merge "Changes to handle PDPX deploy/undeploy"