Merge "Support sentinel values for CHAR LIMIT."