Merge "PAP S3P documentation"