Merge "Fix obsolete API reference" into klp-dev