Merge "docs: Fix a bunch of issues" into jb-mr1-dev