Merge "Fix typo." into jb-dev