Merge "Add the CHAR LIMIT annotation"