Merge "Update char limit" into udc-dev