Merge "Fixed a buffer overflow issue" into jb-dev