public marks

PUBLIC MARKS from dzc with tags avis & "git merge"