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