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

* commit '6958c161a9f12aaa1db33bdc526040c3691638dc':
  docs: misc bug fixes from external issues