Merge branch 'ks/doc-fixes'