Merge "docs: edits" into jb-mr1-dev