Merge "typo" into jb-mr2-dev