Merge "Spelling." into jb-mr1-dev