Merge "Docs changes pursuant to API review feedback." into klp-dev