Merge branch 'hns-kdoc'