Merge branch 'bb/unicode-12.1-reiwa' into maint