Merge "typo fix" into jb-dev