Merge "String change." into jb-dev