Merging pipeline s3 code to upstream