Sync with r21-4-4-utf-2000-new-case2.