Merge branch 'kb/unicode' into pu