Merge "Fix s3p script for api"