Merge "Add CHAR LIMIT as appropriate for newish strings"