Merge "docs: misc bug fixes from external issues" into jb-dev