Merge "Bump string length limits"