Feature/eng 293 s3 links