Merge change 6603 into donut

* changes:
  quick fix; utf8_codepoint_count must be utf8_length