Sync with r21-2-19-utf-2000-0_8-2-charset-alias.