Merge branch 'cn/doc-config-bare-subsection'