Merge "Update char_limit for new string"