Merge "Fix docs" into klp-modular-dev