Merge branch 'jc/tag-doc'