Merge "Fix Minor typos" into jb-dev