Brought dcp-utf8 in line with other developments