public marks

PUBLIC MARKS from nhoizey with tags s3 & NAS