am 075e4e3d: Merge "Increase string lengths" into jb-mr2-dev

* commit '075e4e3d56b725d87eb2037d88192e2cdf1f1379':
  Increase string lengths