Merge "[kairos] Fixup KDocs" into main