Merge "API S3P documentation"