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

* commit 'bd2b531359d7402b742c4a126ff1c0782107ab79':
  docs: edits