public marks

PUBLIC MARKS from asteroza with tags shared & 2.0