Merge "fix typo" into klp-dev