Merge "Add string length limits"