Merge "Increase string length limit to fit translation." into jb-dev