20609 Simplified doc patch after code-review