public marks

PUBLIC MARKS from crazybaud with tags dev & quick