Merge branch 'llc-kdoc'