public marks

PUBLIC MARKS from bl7539f8 with tags start & Jose