Merge "Cleanup API typo" into klp-dev