Merge "Doc update: typo" into jb-mr1.1-docs