Merge "Increase char limit for string." into nyc-mr1-dev