Merge "Bug 6954576: Typos and errors in topic" into jb-mr1-dev