Merge branch 'kdoc'