Merge "Fix bug #6408393 Character corruption is caused when locale is changed" into jb-dev