Merge "Doc change: API diff 20." into klp-modular-dev