r10228: update for sb-unicode