Issue #5907: Fix API reference issues