am 3722947f: Merge "Doc update: manual merge of changes from jb-mr1.1" into jb-mr2-dev

* commit '3722947f2f22b9b56a7479bd29af2680e608f674':
  Doc update: manual merge of changes from jb-mr1.1