public marks

PUBLIC MARKS from gn_almeida with tags case & strategy