Merge branch 'bb/unicode-12'