Merge "docs: Another fix for external 42607" into jb-mr1-dev