public marks

PUBLIC MARKS from nhoizey with tags beta & 2.0