Merge branch 'jk/utf8-switch-between-nfd-and-nfc'