Merge "PAP erroneously undeploying policies"