public marks

PUBLIC MARKS from newandforever with tags cf-w5 & iondavidoff7823