PR [CA-383] Added the S3 support