Merge pull request #4934 from koying/fixjnitypo