Merge "Add scripts to automate S3P tests"