Sync with r21-4-0-utf-2000-0_19-new-case.