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