Merge branch 'refactor-syntax_unicode_xinit3' into refactor-syntax_unicode_xinit