Merge "Added CHAR LIMIT to string" into honeycomb