Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs