issue #4660: Updates where uses cc_utf8_strlen