Merge "Fixing typos" into jb-mr1-dev