Merge "Increase CHAR LIMIT" into oc-dr1-dev