Merge "Documentation changes for PAP S3P testing"