Merge branch 'kb/doc-exclude-directory-semantics'