am 66adf0d0: am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev

* commit '66adf0d04d92257e60a583617fb97f136fefd192':
  docs: resolve bugs from external tracker