public marks

PUBLIC MARKS from gvlx with tags test & windows