Merge "Added CHAR LENGTH to some strings"