Merge "Update PAP documentation"