Merge branch 'kn/tag-doc-fix' into maint