Merge "Update developer and s3p docs"