Merge "Fix docs" into klp-dev