Merge branch 'klp-docs' into klp-modular-docs

Change-Id: If02b1d5be9d0568eaabb2800317866edf737c7e4