Merge "Add conditional block for s3"