public marks

PUBLIC MARKS from cbn19 with tags optimisation & 4021