Merge branch 'ds/doc-two-kinds-of-tags'