Merge "Correct the char limit for strings" into udc-dev