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

* commit '5b56d43237d959403bb8a32de25376deee2dab22':
  docs: resolve bugs from external tracker