public marks

PUBLIC MARKS from XavierMilaret with tags association & insertion