Merge branch 'rr/precompose-utf8-cleanup'