Merge "Fix UnicodeBlockTest." into klp-modular-dev