public marks

PUBLIC MARKS from nhoizey with tags update & firmware