Merge branch 'rd/tag-doc-lightweight'